diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-23 17:58:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-23 17:58:45 (GMT) |
| commit | 3ac06f540761fa259317f773c8a4517e252623a3 (patch) | |
| tree | eaeca7b5ffa14177fc99afeec55cfe11b10c0376 /mkspecs | |
| parent | f6835920b5497f228e2aa3ba397437af30a0bfe9 (diff) | |
| parent | 9d285e0b9f49fd5bdf3976e99b8ec168f9d7add6 (diff) | |
| download | Qt-3ac06f540761fa259317f773c8a4517e252623a3.zip Qt-3ac06f540761fa259317f773c8a4517e252623a3.tar.gz Qt-3ac06f540761fa259317f773c8a4517e252623a3.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:
Provide the Webkit Qml plugin with a UID3 on Symbian
Provide Qml plugins with UID3s on Symbian
Fix "missing store_build" errors
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/sis_targets.prf | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mkspecs/features/sis_targets.prf b/mkspecs/features/sis_targets.prf index 37b758b..4207e0b 100644 --- a/mkspecs/features/sis_targets.prf +++ b/mkspecs/features/sis_targets.prf @@ -170,6 +170,12 @@ equals(GENERATE_SIS_TARGETS, true) { sis_target.commands = sis_target.target = sis QMAKE_EXTRA_TARGETS += sis_target + + symbian-abld { + # Create dummy store_build target to avoid errors from .mk callbacks during build + store_build_target.target = store_build + QMAKE_EXTRA_TARGETS += store_build_target + } } QMAKE_DISTCLEAN += $${sis_destdir}$${TARGET}.sis |