From a723e53357cab6c918a3c048b6c4824fe42308f6 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Tue, 23 Mar 2010 18:30:04 +0100
Subject: [PATCH] Prefer command line arguments over environment for specifying
certificates for sis creation.
---
.../qt4projectmanager/qt-s60/s60createpackagestep.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
index a05801b53f8..8bf413dac36 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
@@ -101,12 +101,14 @@ bool S60CreatePackageStep::init()
return false;
Qt4BuildConfiguration *bc = qt4BuildConfiguration();
ProjectExplorer::Environment environment = bc->environment();
+ setEnvironment(environment);
+ QStringList args;
+ args << QLatin1String("sis");
if (signingMode() == SignCustom) {
- environment.set(QLatin1String("QT_SIS_CERTIFICATE"), QDir::toNativeSeparators(customSignaturePath()));
- environment.set(QLatin1String("QT_SIS_KEY"), QDir::toNativeSeparators(customKeyPath()));
+ args << QLatin1String("QT_SIS_CERTIFICATE=") + QDir::toNativeSeparators(customSignaturePath())
+ << QLatin1String("QT_SIS_KEY=") + QDir::toNativeSeparators(customKeyPath());
}
- setEnvironment(environment);
- setArguments(QStringList() << "sis"); // overwrite any stuff done in make step
+ setArguments(args); // overwrite any stuff done in make step
return true;
}
--
GitLab