diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-26 23:37:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-26 23:37:57 (GMT) |
| commit | 8f21474fb8b8d51d00d71f566e1b291b926b42bd (patch) | |
| tree | 8d75d6d21c1e55a2866e11aa1bb9f0f922299672 /mkspecs/features/sis_targets.prf | |
| parent | 47769726d3d8db03153acfcd9552fd9bc0535358 (diff) | |
| parent | 5d7c1a1148d4c779cbcb5242ac6106c6ee35d57b (diff) | |
| download | Qt-8f21474fb8b8d51d00d71f566e1b291b926b42bd.zip Qt-8f21474fb8b8d51d00d71f566e1b291b926b42bd.tar.gz Qt-8f21474fb8b8d51d00d71f566e1b291b926b42bd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed package creation when shadow building.
Fix crash caused by not clearing the QPixmapCache on application exit.
Removed QEXPECT_FAIL macros from test cases which now pass
Ensure backing store is deleted before top-level window
Diffstat (limited to 'mkspecs/features/sis_targets.prf')
| -rw-r--r-- | mkspecs/features/sis_targets.prf | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mkspecs/features/sis_targets.prf b/mkspecs/features/sis_targets.prf index 615bbe5..f7e633c 100644 --- a/mkspecs/features/sis_targets.prf +++ b/mkspecs/features/sis_targets.prf @@ -125,25 +125,27 @@ equals(GENERATE_SIS_TARGETS, true) { QMAKE_EXTRA_TARGETS += store_build_target } } else { + qtPrepareTool(QMAKE_CREATEPACKAGE, createpackage) + sis_destdir = $$DESTDIR isEmpty(sis_destdir):sis_destdir = . baseTarget = $$basename(TARGET) !equals(TARGET, "$$baseTarget"):sis_destdir = $$sis_destdir/$$dirname(TARGET) sis_target.target = sis - sis_target.commands = createpackage $(QT_SIS_OPTIONS) $${baseTarget}_template.pkg \ + sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) $${baseTarget}_template.pkg \ - $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) sis_target.depends = first unsigned_sis_target.target = unsigned_sis - unsigned_sis_target.commands = createpackage $(QT_SIS_OPTIONS) -o $${baseTarget}_template.pkg + unsigned_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) -o $${baseTarget}_template.pkg unsigned_sis_target.depends = first target_sis_target.target = $${sis_destdir}/$${baseTarget}.sis target_sis_target.commands = $(MAKE) -f $(MAKEFILE) sis installer_sis_target.target = installer_sis - installer_sis_target.commands = createpackage $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \ + installer_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \ $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) installer_sis_target.depends = $${sis_destdir}/$${baseTarget}.sis |