Commit a723e533 authored by con's avatar con
Browse files

Prefer command line arguments over environment for specifying certificates

for sis creation.
parent de28b61c
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment