diff options
author | Janne Anttila <janne.anttila@digia.com> | 2009-08-31 07:50:25 (GMT) |
---|---|---|
committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-31 07:50:25 (GMT) |
commit | 43cf31a43a5359c83b7851554f6df5fe75e1c285 (patch) | |
tree | cadc091db0cf1546b1fbe94b275692964d8a9d91 /qmake/generators | |
parent | 10e3f11057218dac621087980bc37db464838941 (diff) | |
parent | b1fb9651145560803aec7408aebba2c0be5823de (diff) | |
download | Qt-43cf31a43a5359c83b7851554f6df5fe75e1c285.zip Qt-43cf31a43a5359c83b7851554f6df5fe75e1c285.tar.gz Qt-43cf31a43a5359c83b7851554f6df5fe75e1c285.tar.bz2 |
Merge branch 'master' into 4.6
Diffstat (limited to 'qmake/generators')
-rw-r--r-- | qmake/generators/symbian/symmake.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index 48fc8ef..3aa3c7b 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -1649,7 +1649,7 @@ void SymbianMakefileGenerator::writeSisxTargets(QTextStream &t) t << OK_SISX_TARGET ":" << endl; - QString pkgcommand = QString("\tcreatepackage.bat %1_template.%2 $(QT_SISX_TARGET) " \ + QString pkgcommand = QString("\tcreatepackage.bat $(QT_SISX_OPTIONS) %1_template.%2 $(QT_SISX_TARGET) " \ "$(QT_SISX_CERTIFICATE) $(QT_SISX_KEY) $(QT_SISX_PASSPHRASE)") .arg(fixedTarget) .arg("pkg"); |