[PATCH] Use windows argument format for nsis on windows

Wald Commits scm-commit at wald.intevation.org
Tue Apr 29 19:52:21 CEST 2014


# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1398793939 0
# Node ID 522b4e28c073aa76dac23839ce5a8ceee35930a8
# Parent  82770fa41af9ecc15ceb1c883572f05579ad6992
Use windows argument format for nsis on windows

diff -r 82770fa41af9 -r 522b4e28c073 ui/createinstallerdialog.cpp
--- 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";
 


More information about the Trustbridge-commits mailing list