diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-28 07:48:37 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-28 07:48:37 (GMT) |
| commit | d7cdd1989081a0da7746fb6ce64896c0fe85e9d5 (patch) | |
| tree | a13b5f2ae04e3b4f52000e050b31a48d72c81808 /qmake/generators/symbian/symmake.cpp | |
| parent | 92718f6b01071ff4d4947b5fa8297d7ecf6d9a4b (diff) | |
| download | Qt-d7cdd1989081a0da7746fb6ce64896c0fe85e9d5.zip Qt-d7cdd1989081a0da7746fb6ce64896c0fe85e9d5.tar.gz Qt-d7cdd1989081a0da7746fb6ce64896c0fe85e9d5.tar.bz2 | |
Changed createpackage parameters to be more consistent with make targets.
Earlier createpackage required two separate parameters to define the
platform and target. For example
> createpackage fluidlauncher_template.pkg release armv5
Now it is changed to:
> createpackage fluidlauncher_template.pkg release-armv5
This is consistent to make target what is used to do the building i.e.:
> make release-armv5
The change also affected environment variables supported by 'make sisx'
target. QT_SISX_PLATFORM is not any more supported, and the info is
merged QT_SISX_TARGET variable.
Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'qmake/generators/symbian/symmake.cpp')
| -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 aaa1903..48fc8ef 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -1650,7 +1650,7 @@ void SymbianMakefileGenerator::writeSisxTargets(QTextStream &t) t << OK_SISX_TARGET ":" << endl; QString pkgcommand = QString("\tcreatepackage.bat %1_template.%2 $(QT_SISX_TARGET) " \ - "$(QT_SISX_PLATFORM) $(QT_SISX_CERTIFICATE) $(QT_SISX_KEY) $(QT_SISX_PASSPHRASE)") + "$(QT_SISX_CERTIFICATE) $(QT_SISX_KEY) $(QT_SISX_PASSPHRASE)") .arg(fixedTarget) .arg("pkg"); t << pkgcommand << endl; |