diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-25 04:00:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-25 04:00:51 (GMT) |
| commit | 3ea6d3e9d7c66cc9058c75c2fb38d4e38d2352b0 (patch) | |
| tree | bd1a7d88e8417e998581c42cdb3fb8745da28238 /mkspecs | |
| parent | 27f6164ecc50546ef31e17e57ea528aabcd6808a (diff) | |
| parent | db4dda63e54731424a2c4b0d406df87c022da462 (diff) | |
| download | Qt-3ea6d3e9d7c66cc9058c75c2fb38d4e38d2352b0.zip Qt-3ea6d3e9d7c66cc9058c75c2fb38d4e38d2352b0.tar.gz Qt-3ea6d3e9d7c66cc9058c75c2fb38d4e38d2352b0.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:
Always prepend drive letter to $$EPOCROOT in Windows Symbian builds
Add files deployed using qmake_emulator_deployment.flm to 'what' list
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm index 39ab0f0..8791a47 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm +++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm @@ -33,5 +33,6 @@ ifeq ($($(SINGLETON)),) $(eval $(call qmake_emulator_deployment, $(subst $(CHAR_SPACE),\$(CHAR_SPACE),$(DEPLOY_TARGET)), $(subst $(CHAR_SPACE),\$(CHAR_SPACE),$(DEPLOY_SOURCE)))) $(call makepath,$(dir $(DEPLOY_TARGET))) $(eval $(call GenerateStandardCleanTarget,$(CLEAN_TARGET),'')) +$(eval $(call whatmacro,$(CLEAN_TARGET))) endif |