diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-11 02:13:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-11 02:13:18 (GMT) |
| commit | 57ce4cba0747d31075d9479c06070dd8aac2b7de (patch) | |
| tree | e8f44ce1d7ecb5d22212ad5989df4d2759ba22ff /mkspecs/symbian-sbsv2 | |
| parent | 3c0a4a16fa857fcf6ec89ef6e3376b262eaeca62 (diff) | |
| parent | b18bd68dd05f000c65e33a975bca6bf24dabb8d3 (diff) | |
| download | Qt-57ce4cba0747d31075d9479c06070dd8aac2b7de.zip Qt-57ce4cba0747d31075d9479c06070dd8aac2b7de.tar.gz Qt-57ce4cba0747d31075d9479c06070dd8aac2b7de.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (265 commits)
Partial update window surfaces always need a repaint before flush.
Fix for misplaced endif in qglobal.h.
Implement language fallback logic for localize_deployment
Added missing ifdefs to allow compilation on older Symbian versions.
Multiple screen support for Symbian in QDeskopWidget.
Adding quote around files in QMAKE_CLEAN to tackle wildcard issue
Bump Qt version to 4.7.3
Fix unstable qdeclarativeflickable test.
Added native image handle provider header.
Fix possible bearer management Crash with Panic E32USER-CBase, 69
Added native image handle provider support in pixmaps on openvg.
Correcting incorrect ordinal introduced by the split view changes.
Support partial input mode
Update TextEdit's visible selection when only the anchor changes.
Fixed memory leak in GL texture cache with QRuntimePixmapData.
Avoid compiler warnings in openvg on win32.
Updated def files with new QVGPixmapData function.
VGImage readback support in QPixmap on OpenVG.
Invalidate the EGL surface of QMeeGoLivePixmapData when switching to Raster
QNetworkCookie: fix quoted values
...
Diffstat (limited to 'mkspecs/symbian-sbsv2')
| -rw-r--r-- | mkspecs/symbian-sbsv2/flm/qt/qmake_clean.flm | 18 | ||||
| -rw-r--r-- | mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm | 1 | ||||
| -rw-r--r-- | mkspecs/symbian-sbsv2/flm/qt/qt.xml | 5 |
3 files changed, 24 insertions, 0 deletions
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_clean.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_clean.flm new file mode 100644 index 0000000..c9a88fc --- /dev/null +++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_clean.flm @@ -0,0 +1,18 @@ +# /**************************************************************************** +# ** +# ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +# ** Contact: Nokia Corporation (qt-info@nokia.com) +# ** +# ** This file is part of symbian-sbsv2 mkspec. +# ** +# ****************************************************************************/ + + +SINGLETON:=$(call sanitise,QMAKE_CLEAN_SINGLETON_$(EXTENSION_ROOT)) + +ifeq ($($(SINGLETON)),) +# Prevent duplicate targets from being created +$(SINGLETON):=1 +$(eval $(call GenerateStandardCleanTarget,$(wildcard $(patsubst "%",%,$(CLEAN_FILES))))) +endif + 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 diff --git a/mkspecs/symbian-sbsv2/flm/qt/qt.xml b/mkspecs/symbian-sbsv2/flm/qt/qt.xml index ddd8d55..f2f32ee 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qt.xml +++ b/mkspecs/symbian-sbsv2/flm/qt/qt.xml @@ -38,4 +38,9 @@ <interface name="qt.qmake_store_build" extends="Symbian.UserFLM" flm="qmake_store_build.flm"> </interface> + + <interface name="qt.qmake_clean" extends="Symbian.UserFLM" + flm="qmake_clean.flm"> + <param name='CLEAN_FILES' /> + </interface> </build> |