Mercurial > trustbridge
comparison ui/createinstallerdialog.cpp @ 541:1cddf87f8f83
ix variable path seperator
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Tue, 29 Apr 2014 18:08:51 +0000 |
| parents | 81d6657757f3 |
| children | 421b69eeffe3 |
comparison
equal
deleted
inserted
replaced
| 540:d7ab9e734317 | 541:1cddf87f8f83 |
|---|---|
| 206 mNSISProc.setProgram("makensis"); | 206 mNSISProc.setProgram("makensis"); |
| 207 mNSISProc.setProcessChannelMode(QProcess::MergedChannels); | 207 mNSISProc.setProcessChannelMode(QProcess::MergedChannels); |
| 208 mNSISProc.setWorkingDirectory(outDir.path()); | 208 mNSISProc.setWorkingDirectory(outDir.path()); |
| 209 #ifdef Q_OS_WIN | 209 #ifdef Q_OS_WIN |
| 210 arguments << QString::fromLatin1("/Dfiles_dir=") + binDir.path().replace("/", "\\") + "\\windows"; | 210 arguments << QString::fromLatin1("/Dfiles_dir=") + binDir.path().replace("/", "\\") + "\\windows"; |
| 211 arguments << "/Dpath_sep=\\" | 211 arguments << "/Dpath_sep=\\"; |
| 212 foreach (const QString &key, keys) { | 212 foreach (const QString &key, keys) { |
| 213 arguments << QString::fromLatin1("/D%1=%2").arg(key, | 213 arguments << QString::fromLatin1("/D%1=%2").arg(key, |
| 214 options.value(key, QString()).toString()); | 214 options.value(key, QString()).toString()); |
| 215 } | 215 } |
| 216 #else | 216 #else |
| 217 arguments << QString::fromLatin1("-Dfiles_dir=") + binDir.path() + "/windows"; | 217 arguments << QString::fromLatin1("-Dfiles_dir=") + binDir.path() + "/windows"; |
| 218 arguments << "-Dpath_sep=/"; | |
| 218 foreach (const QString &key, keys) { | 219 foreach (const QString &key, keys) { |
| 219 arguments << QString::fromLatin1("-D%1=%2").arg(key, | 220 arguments << QString::fromLatin1("-D%1=%2").arg(key, |
| 220 options.value(key, QString()).toString()); | 221 options.value(key, QString()).toString()); |
| 221 } | 222 } |
| 222 arguments << "-Dpath_sep=/" | |
| 223 #endif | 223 #endif |
| 224 | 224 |
| 225 arguments << binDir.path() + "/trustbridge.nsi"; | 225 arguments << binDir.path() + "/trustbridge.nsi"; |
| 226 | 226 |
| 227 qDebug() << "Starting makensis with arguments: " << arguments; | 227 qDebug() << "Starting makensis with arguments: " << arguments; |