diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-08-31 11:57:08 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-08-31 12:48:27 (GMT) |
| commit | 0781e6e539b07872f5d2063594a2057f3e31c9ec (patch) | |
| tree | d8fbec55e510146f0749426fe98f714701a18250 /mkspecs/symbian-sbsv2/flm | |
| parent | cf28f6cacf59d434072656af05466541ba69e8ae (diff) | |
| download | Qt-0781e6e539b07872f5d2063594a2057f3e31c9ec.zip Qt-0781e6e539b07872f5d2063594a2057f3e31c9ec.tar.gz Qt-0781e6e539b07872f5d2063594a2057f3e31c9ec.tar.bz2 | |
Fix gcce building of apps using static libraries in symbian-sbsv2
Removed usage of buggy .release_gcce target from symbian-sbsv2
generated makefiles. Now gcce builds like armv5 as it is supposed to
when using Raptor.
Task-number: QTBUG-13307
Reviewed-by: axis
Diffstat (limited to 'mkspecs/symbian-sbsv2/flm')
| -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, 1 insertions, 2 deletions
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm index 47c3f1e..21638ea 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)-$(VARIANTPLATFORM) >> $(CACHE_FILENAME) + echo QT_SIS_TARGET ?= $(VISUAL_CFG)-$(PLATFORM_PATH) >> $(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 12857a2..0f7db3c 100644 --- a/mkspecs/symbian-sbsv2/flm/qt/qt.xml +++ b/mkspecs/symbian-sbsv2/flm/qt/qt.xml @@ -37,6 +37,5 @@ <interface name="qt.qmake_store_build" extends="Symbian.UserFLM" flm="qmake_store_build.flm"> - <param name='VARIANTPLATFORM' /> </interface> </build> |