trustbridge: ui/createinstallerdialog.cpp comparison

Actually set the arguments for makensis process. Fix escaping

author	Andre Heinecke <aheinecke@intevation.de>
date	Tue, 29 Apr 2014 09:25:51 +0000
parents	3332db04c77d
children	f6371e9c959a

comparison

equal deleted inserted replaced

-:a3e027cd0683
+:31e0a86f5a35
 QMessageBox::warning(this, tr("Error!"), msg);
 }
 void CreateInstallerDialog::processFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
+qDebug() << "Finished: " << mNSISProc.readAll();
 mProgress.cancel();
 }
 void CreateInstallerDialog::processError(QProcess::ProcessError error)
 {
+qDebug() << "Error: " << mNSISProc.readAll();
 mProgress.cancel();
 }
 void CreateInstallerDialog::createInstaller()
 {
 }
 /* Copy windows directory contents to tmpdir */
 QStringList arguments;
 mNSISProc.setProgram("makensis");
+mNSISProc.setProcessChannelMode(QProcess::MergedChannels);
 mNSISProc.setWorkingDirectory(outDir.path());
 arguments << QString::fromLatin1("-Dfiles_dir=") + binDir.path() + "/windows";
 foreach (const QString &key, keys) {
-arguments << QString::fromLatin1("-D%1=\"%2\"").arg(key,
+arguments << QString::fromLatin1("-D%1=%2").arg(key,
 options.value(key, QString()).toString());
 }
 arguments << binDir.path() + "/trustbridge.nsi";
+qDebug() << "Starting makensis with arguments: " << arguments;
+mNSISProc.setArguments(arguments);
 mNSISProc.start();
 mProgress.show();
 if (!mNSISProc.waitForStarted() ||
 mNSISProc.state() == QProcess::NotRunning) {
 showErrorMessage(tr("Failed to start makensis.\n"
 "Please ensure that makensis is installed and in your PATH variable."));
 }
+}
-}

Mercurial > trustbridge