trustbridge: ui/createinstallerdialog.cpp comparison

Actually write the installer to the output folder

author	Andre Heinecke <aheinecke@intevation.de>
date	Tue, 29 Apr 2014 18:28:13 +0000
parents	1cddf87f8f83
children	6c4fff146999

comparison

equal deleted inserted replaced

-:1cddf87f8f83
+:421b69eeffe3
 }
 void CreateInstallerDialog::processFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
 FinishedDialog *fin = new FinishedDialog(0, tr("Created installer in %1.")
-.arg(mBinaryFolder->text()), mNSISProc.readAll(), false);
+.arg(mSaveFile->text()), mNSISProc.readAll(), false);
 qDebug() << "Finished: " << mNSISProc.readAll();
 mProgress.cancel();
 fin->show();
 close();
 }
 mNSISProc.setWorkingDirectory(outDir.path());
 #ifdef Q_OS_WIN
 arguments << QString::fromLatin1("/Dfiles_dir=") + binDir.path().replace("/", "\\") + "\\windows";
 arguments << "/Dpath_sep=\\";
 foreach (const QString &key, keys) {
-arguments << QString::fromLatin1("/D%1=%2").arg(key,
+QString value = options.value(key, QString()).toString();
-options.value(key, QString()).toString());
+if (key == "setupname") {
+value = value.arg(outDir.path().replace("/", "\\") + "\\");
+}
+arguments << QString::fromLatin1("/D%1=%2").arg(key, value);
 }
 #else
 arguments << QString::fromLatin1("-Dfiles_dir=") + binDir.path() + "/windows";
 arguments << "-Dpath_sep=/";
 foreach (const QString &key, keys) {
-arguments << QString::fromLatin1("-D%1=%2").arg(key,
+QString value = options.value(key, QString()).toString();
-options.value(key, QString()).toString());
+if (key == "setupname") {
+value = value.arg(outDir.path() + "/");
+}
+arguments << QString::fromLatin1("-D%1=%2").arg(key, value);
 }
 #endif
 arguments << binDir.path() + "/trustbridge.nsi";

Mercurial > trustbridge