diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-11 20:50:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-11 20:50:37 (GMT) |
| commit | 30318cd719255f782dcc1a0d948eea0054bdf737 (patch) | |
| tree | eb053d4a7538cd9da3dda0a879cfb4047a3b5c45 /mkspecs | |
| parent | 263bdc38f494e5d0be69b61c92ca6456fc4db330 (diff) | |
| parent | 8adeb2742a701080c7e6568a6aca1f27079e1909 (diff) | |
| download | Qt-30318cd719255f782dcc1a0d948eea0054bdf737.zip Qt-30318cd719255f782dcc1a0d948eea0054bdf737.tar.gz Qt-30318cd719255f782dcc1a0d948eea0054bdf737.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:
Added documentation for Spectrum Analyzer demo
Do not include Spectrum Analyzer demo in static builds
Gcce building support for symbian-sbsv2
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> |