diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-08-11 09:46:59 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-08-13 08:56:47 (GMT) |
| commit | 6a4bb9e215e0e33a1e1ca926f93bdea89d1ec042 (patch) | |
| tree | 7c27fd04f2bb491377d2a5a5d7385a53d0306967 /mkspecs | |
| parent | 810b8c896d9fabfebd675db2b03c69eefef40d19 (diff) | |
| download | Qt-6a4bb9e215e0e33a1e1ca926f93bdea89d1ec042.zip Qt-6a4bb9e215e0e33a1e1ca926f93bdea89d1ec042.tar.gz Qt-6a4bb9e215e0e33a1e1ca926f93bdea89d1ec042.tar.bz2 | |
Gcce building support for symbian-sbsv2
It is now possible to use "release-gcce" and "debug-gcce" targets
in symbian-sbsv2 mkspec. Exports and cleans should also now work
properly for all target platforms under symbian-sbsv2.
Task-number: QTBUG-12762
Reviewed-by: Jason Barron
(cherry picked from commit bdfbedf971f3e9ef99977652308b9e2b1c213210)
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm | 2 | ||||
| -rw-r--r-- | mkspecs/symbian-sbsv2/flm/qt/qt.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm index e0b6503..47c3f1e 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm +++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm @@ -38,7 +38,7 @@ $(STORE_BUILD_TARGET): echo "# make sis target." >> $(CACHE_FILENAME) && \ echo "# Version : " >> $(CACHE_FILENAME) && \ echo "# ==============================================================================" >> $(CACHE_FILENAME) && \ - echo QT_SIS_TARGET ?= $(VISUAL_CFG)-$(PLATFORM_PATH) >> $(CACHE_FILENAME) \ + echo QT_SIS_TARGET ?= $(VISUAL_CFG)-$(VARIANTPLATFORM) >> $(CACHE_FILENAME) $(call endrule,qmake_store_build) endef diff --git a/mkspecs/symbian-sbsv2/flm/qt/qt.xml b/mkspecs/symbian-sbsv2/flm/qt/qt.xml index 0f7db3c..12857a2 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qt.xml +++ b/mkspecs/symbian-sbsv2/flm/qt/qt.xml @@ -37,5 +37,6 @@ <interface name="qt.qmake_store_build" extends="Symbian.UserFLM" flm="qmake_store_build.flm"> + <param name='VARIANTPLATFORM' /> </interface> </build> |