summaryrefslogtreecommitdiffstats
path: root/mkspecs/common
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-10-19 06:47:29 (GMT)
committeraxis <qt-info@nokia.com>2010-12-23 15:29:16 (GMT)
commit7a3cac878f4f4a7c2cf3ea08557ee63d8c6a9330 (patch)
tree12daf85a2c3f1a0f401cc69d361d268ee2772e2d /mkspecs/common
parent76c1492a51746730c1b51539b87f8d8c810f44ff (diff)
downloadQt-7a3cac878f4f4a7c2cf3ea08557ee63d8c6a9330.zip
Qt-7a3cac878f4f4a7c2cf3ea08557ee63d8c6a9330.tar.gz
Qt-7a3cac878f4f4a7c2cf3ea08557ee63d8c6a9330.tar.bz2
Fixed some tools definitions and properties in symbian profiles.
This is needed for Symbian development on Windows using makefiles. RevBy: Trust me
Diffstat (limited to 'mkspecs/common')
-rw-r--r--mkspecs/common/armcc.conf1
-rw-r--r--mkspecs/common/symbian/symbian.conf4
2 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/common/armcc.conf b/mkspecs/common/armcc.conf
index 2c765bc..4f178d7 100644
--- a/mkspecs/common/armcc.conf
+++ b/mkspecs/common/armcc.conf
@@ -37,5 +37,6 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_THREAD +=
QMAKE_AR = armar --create
+QMAKE_LIB = armar --create
QMAKE_RANLIB =
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 8c79d8b..ed14b32 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -114,11 +114,11 @@ contains(QMAKE_HOST.os,Windows) {
}
QMAKE_IDL = midl
-QMAKE_LIB = ar -ru
-QMAKE_RC = windres
QMAKE_ZIP = zip -r -9
QMAKE_UNZIP = unzip -o
+QMAKE_WRITE_DEFAULT_RC = 1
+
QMAKE_TAR = tar -cf
QMAKE_GZIP = gzip -9f