feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Prefer command line arguments over environment for specifying certificates

Browse Source 
for sis creation.
This commit is contained in:
con
2010-03-23 18:30:04 +01:00
parent de28b61cca
commit a723e53357
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
View File

@@ -101,12 +101,14 @@ bool S60CreatePackageStep::init()
return false;
Qt4BuildConfiguration *bc = qt4BuildConfiguration();
ProjectExplorer::Environment environment = bc->environment();
if (signingMode() == SignCustom) {
environment.set(QLatin1String("QT_SIS_CERTIFICATE"), QDir::toNativeSeparators(customSignaturePath()));
environment.set(QLatin1String("QT_SIS_KEY"), QDir::toNativeSeparators(customKeyPath()));
}
setEnvironment(environment);
setArguments(QStringList() << "sis"); // overwrite any stuff done in make step
QStringList args;
args << QLatin1String("sis");
if (signingMode() == SignCustom) {
args << QLatin1String("QT_SIS_CERTIFICATE=") + QDir::toNativeSeparators(customSignaturePath())
<< QLatin1String("QT_SIS_KEY=") + QDir::toNativeSeparators(customKeyPath());
}
setArguments(args); // overwrite any stuff done in make step
return true;
}