diff ui/createinstallerdialog.cpp @ 1134:f1384bf9d4a4

Mergerd
author Sascha Wilde <wilde@intevation.de>
date Wed, 17 Sep 2014 15:01:19 +0200
parents a162f4cbba75
children 2a1206932f53
line wrap: on
line diff
--- a/ui/createinstallerdialog.cpp	Wed Sep 17 13:13:33 2014 +0200
+++ b/ui/createinstallerdialog.cpp	Wed Sep 17 15:01:19 2014 +0200
@@ -294,6 +294,8 @@
     mNSISProc.setWorkingDirectory(outDir.path());
 #ifdef Q_OS_WIN
     arguments << QString::fromLatin1("/Dfiles_dir=") + mCurrentWorkingDir->path().replace("/", "\\");
+    QString resourcedir = binDir.path() + "/resources";
+    arguments << QString::fromLatin1("/Dplugin_dir=") + resourcedir.replace("/", "\\");
     arguments << "/Dpath_sep=\\";
     foreach (const QString &key, keys) {
         QString value = options.value(key, QString()).toString();
@@ -306,6 +308,7 @@
     arguments << QString(binDir.path() + "/trustbridge.nsi").replace("/", "\\");
 #else
     arguments << QString::fromLatin1("-Dfiles_dir=") + mCurrentWorkingDir->path();
+    arguments << QString::fromLatin1("-Dplugin_dir=") + binDir.path() + "/resources";
     arguments << "-Dpath_sep=/";
     foreach (const QString &key, keys) {
         QString value = options.value(key, QString()).toString();

http://wald.intevation.org/projects/trustbridge/