Mercurial > trustbridge
changeset 537:522b4e28c073
Use windows argument format for nsis on windows
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Tue, 29 Apr 2014 17:52:19 +0000 |
| parents | 82770fa41af9 |
| children | 0290adbdc380 |
| files | ui/createinstallerdialog.cpp |
| diffstat | 1 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ui/createinstallerdialog.cpp Tue Apr 29 16:57:04 2014 +0000 +++ b/ui/createinstallerdialog.cpp Tue Apr 29 17:52:19 2014 +0000 @@ -206,11 +206,19 @@ mNSISProc.setProgram("makensis"); mNSISProc.setProcessChannelMode(QProcess::MergedChannels); mNSISProc.setWorkingDirectory(outDir.path()); +#ifdef Q_OS_WIN + arguments << QString::fromLatin1("/Dfiles_dir=") + binDir.path() + "/windows"; + foreach (const QString &key, keys) { + arguments << QString::fromLatin1("/D%1=%2").arg(key, + options.value(key, QString()).toString()); + } +#else arguments << QString::fromLatin1("-Dfiles_dir=") + binDir.path() + "/windows"; foreach (const QString &key, keys) { arguments << QString::fromLatin1("-D%1=%2").arg(key, options.value(key, QString()).toString()); } +#endif arguments << binDir.path() + "/trustbridge.nsi";