summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-08-28 06:07:13 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-08-28 06:10:16 (GMT)
commit6ae0b4848526719b526443b853bc95aa85cb6cb9 (patch)
tree69dd19b99e4e2a0d644983d81fbff1ba5a73523d /mkspecs
parent8c4c7cc111331256b2637e067298e1c93b2e8c3c (diff)
downloadQt-6ae0b4848526719b526443b853bc95aa85cb6cb9.zip
Qt-6ae0b4848526719b526443b853bc95aa85cb6cb9.tar.gz
Qt-6ae0b4848526719b526443b853bc95aa85cb6cb9.tar.bz2
Various small fixes and cleanups for symbian qmake generator.
The included fixes / cleanups: - QtLibs PKG filename changed - Component name in Qt libs pkg changed to "Qt for S60" * Done in order to make SISX upgrade possible after pre-release. - Removed passing of 'fixedTarget' member variable as an argument - Removed whitespaces from generated file names - Fixed 'make sisx' calling syntax when custom makefile name used - Fixed MAKEFILE variable content in generated makefiles - Changed names of environment variables used by 'make sisx' * Nee variables have 'QT_SISX_' prefix Reviewed-By: Miikka Heikkinen
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm4
1 files changed, 2 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 101f942..49d9bab 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
@@ -25,8 +25,8 @@ $(STORE_BUILD_TARGET):
echo "# make sisx target." >> $(CACHE_FILENAME) && \
echo "# Version : " >> $(CACHE_FILENAME) && \
echo "# ==============================================================================" >> $(CACHE_FILENAME) && \
- echo PLATFORM ?= $(PLATFORM_PATH) >> $(CACHE_FILENAME) && \
- echo TARGET ?= $(CFG_PATH) >> $(CACHE_FILENAME) \
+ echo QT_SISX_PLATFORM ?= $(PLATFORM_PATH) >> $(CACHE_FILENAME) && \
+ echo QT_SISX_TARGET ?= $(CFG_PATH) >> $(CACHE_FILENAME) \
$(call endrule,qmake_store_build)
endef