summaryrefslogtreecommitdiffstats
path: root/mkspecs/common
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-01-25 17:56:33 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-01-25 17:56:33 (GMT)
commit5422e929cad04633a06c156cba96cfcd69262522 (patch)
treeafb3c9b76c05d80238a1ff76f4e8f4019fac1651 /mkspecs/common
parentac798c5d77c59ea8dfe29c9d1896fb6604e3a628 (diff)
parenta0e0a9378d10db9c8ab3ba4d59f5c576ee4cbc40 (diff)
downloadQt-5422e929cad04633a06c156cba96cfcd69262522.zip
Qt-5422e929cad04633a06c156cba96cfcd69262522.tar.gz
Qt-5422e929cad04633a06c156cba96cfcd69262522.tar.bz2
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts: configure src/network/bearer/bearer.pri
Diffstat (limited to 'mkspecs/common')
-rw-r--r--mkspecs/common/symbian/symbian-makefile.conf3
-rw-r--r--mkspecs/common/symbian/symbian.conf3
2 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf
index 9dc3674..a69b224 100644
--- a/mkspecs/common/symbian/symbian-makefile.conf
+++ b/mkspecs/common/symbian/symbian-makefile.conf
@@ -22,11 +22,8 @@ QMAKE_ELF2E32_FLAGS = --dlldata \
include(../../common/unix.conf)
QMAKE_PREFIX_SHLIB =
-QMAKE_EXTENSION_SHLIB = dll
CONFIG *= no_plugin_name_prefix
-QMAKE_EXTENSION_PLUGIN = dll
QMAKE_PREFIX_STATICLIB =
-QMAKE_EXTENSION_STATICLIB = lib
QMAKE_SYMBIAN_SHLIB = 1
is_using_gnupoc {
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 8f87d4c..37bbb82 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -13,6 +13,9 @@ QMAKE_COMPILER_DEFINES += SYMBIAN
QMAKE_EXT_OBJ = .o
QMAKE_EXT_RES = _res.o
+QMAKE_EXTENSION_SHLIB = dll
+QMAKE_EXTENSION_PLUGIN = dll
+QMAKE_EXTENSION_STATICLIB = lib
QMAKE_LEX = flex
QMAKE_LEXFLAGS =