summaryrefslogtreecommitdiffstats
path: root/mkspecs/symbian-sbsv2/flm
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2010-09-02 01:00:14 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2010-09-02 01:00:14 (GMT)
commit63eab5ef720936dbb5ee76686c6558e18a79e587 (patch)
tree920a29827e6fb83431e90c160616ca73924b455a /mkspecs/symbian-sbsv2/flm
parent661e237be622a5f7886cee7c06f9daa73d4a07d7 (diff)
parente3a76875d1eea19c29fd6c8dec4e0db9252c2d29 (diff)
downloadQt-63eab5ef720936dbb5ee76686c6558e18a79e587.zip
Qt-63eab5ef720936dbb5ee76686c6558e18a79e587.tar.gz
Qt-63eab5ef720936dbb5ee76686c6558e18a79e587.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'mkspecs/symbian-sbsv2/flm')
-rw-r--r--mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm2
-rw-r--r--mkspecs/symbian-sbsv2/flm/qt/qt.xml1
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>