Mercurial > trustbridge
comparison ui/createinstallerdialog.cpp @ 538:0290adbdc380
Use backslashes on Windows for filesdir
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Tue, 29 Apr 2014 18:00:55 +0000 |
| parents | 522b4e28c073 |
| children | 81d6657757f3 |
comparison
equal
deleted
inserted
replaced
| 537:522b4e28c073 | 538:0290adbdc380 |
|---|---|
| 205 QStringList arguments; | 205 QStringList arguments; |
| 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() + "/windows"; | 210 arguments << QString::fromLatin1("/Dfiles_dir=") + binDir.path().replace("/", "\\") + "\\windows"; |
| 211 foreach (const QString &key, keys) { | 211 foreach (const QString &key, keys) { |
| 212 arguments << QString::fromLatin1("/D%1=%2").arg(key, | 212 arguments << QString::fromLatin1("/D%1=%2").arg(key, |
| 213 options.value(key, QString()).toString()); | 213 options.value(key, QString()).toString()); |
| 214 } | 214 } |
| 215 #else | 215 #else |