summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2011-02-01 08:45:23 (GMT)
committeraxis <qt-info@nokia.com>2011-02-03 14:59:36 (GMT)
commit1f904ce8553f4d8a64ac793fe09e3b8cedb8bddf (patch)
treeca00f914a35ccf7d8fdf7360c447affc463498e9
parent0401781da17f949c0d42d176266ff47ed59b0793 (diff)
downloadQt-1f904ce8553f4d8a64ac793fe09e3b8cedb8bddf.zip
Qt-1f904ce8553f4d8a64ac793fe09e3b8cedb8bddf.tar.gz
Qt-1f904ce8553f4d8a64ac793fe09e3b8cedb8bddf.tar.bz2
Fixed wrong static library extension on Symbian.
After commit a1ba5568da6c57e, which moved the extension definitions from the symbian-makefile.conf to symbian.conf, the QMAKE_EXTENSION_STATICLIB was wrong because unix.conf was included later and overwrote it. Turns out we don't need unix.conf, so I just removed it. RevBy: Trust me
-rw-r--r--mkspecs/common/symbian/symbian-makefile.conf2
1 files changed, 0 insertions, 2 deletions
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf
index 0360615..e51de1d 100644
--- a/mkspecs/common/symbian/symbian-makefile.conf
+++ b/mkspecs/common/symbian/symbian-makefile.conf
@@ -19,8 +19,6 @@ QMAKE_ELF2E32_FLAGS = --dlldata \
--compressionmethod bytepair \
--unpaged
-include(../../common/unix.conf)
-
QMAKE_PREFIX_SHLIB =
CONFIG *= no_plugin_name_prefix
QMAKE_PREFIX_STATICLIB =