Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6

3 files changed, 38 insertions, 24 deletions

diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index b1ef354..7162bad 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -70,7 +70,7 @@ QMAKE_LIBS_GUI          = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lhal -lgdi -lws32
 QMAKE_LIBS_NETWORK      = 
 QMAKE_LIBS_EGL          = -llibEGL
 QMAKE_LIBS_OPENGL       = 
-QMAKE_LIBS_OPENVG       = -llibOpenVG -lgraphicsresource
+QMAKE_LIBS_OPENVG       = -llibOpenVG -lgraphicsresource -lfbscli -lbitgdi -lgdi
 QMAKE_LIBS_COMPAT       = 
 QMAKE_LIBS_QT_ENTRY     = -llibcrt0.lib
 QMAKE_LIBS_S60          = -lavkon
diff --git a/mkspecs/features/symbian/def_files.prf b/mkspecs/features/symbian/def_files.prf
index c29d4ec..48d91aa 100644
--- a/mkspecs/features/symbian/def_files.prf
+++ b/mkspecs/features/symbian/def_files.prf
@@ -3,24 +3,32 @@
 
 CONFIG -= def_files_disabled
 
-!isEmpty(defFilePath) {
-    defBlock = \
-    "$${LITERAL_HASH}ifdef WINSCW" \
-    "DEFFILE $$defFilePath/bwins/$${TARGET}.def" \
-    "$${LITERAL_HASH}elif defined EABI" \
-    "DEFFILE $$defFilePath/eabi/$${TARGET}.def" \
-    "$${LITERAL_HASH}endif"
-
-    MMP_RULES += defBlock
-} else {
-    # If defFilePath is not defined, then put the folders containing the DEF files at the
-    # same level as the .pro (and generated MMP) file(s)
-    defBlock = \
-    "$${LITERAL_HASH}ifdef WINSCW" \
-    "DEFFILE ./bwins/$${TARGET}.def" \
-    "$${LITERAL_HASH}elif defined EABI" \
-    "DEFFILE ./eabi/$${TARGET}.def" \
-    "$${LITERAL_HASH}endif"
-
-    MMP_RULES += defBlock
+# Firstly, if the MMP_RULES already contain a defBlock variable, don't generate another one
+# (this bit is slightly magic, because it depends upon everyone creating their DEFFILE statements
+# in a defBlock variable; but otherwise we have to expand MMP_RULES then scan for the DEFFILE keyword)
+!contains(MMP_RULES, defBlock) {
+    # Apps are executables on Symbian, so don't have exports, and therefore don't have DEF files
+    # Plugins use standard DEF files, which qmake generates, so shouldn't be using these DEFFILE
+    # statements - they use the qmake generated statements instead
+    # Static libraries obviously don't have DEF files, as they don't take part in dynamic linkage
+    !contains(TEMPLATE, app):!contains(CONFIG, plugin):!contains(CONFIG, staticlib): {
+        !isEmpty(defFilePath) {
+            defBlock = \
+            "$${LITERAL_HASH}ifdef WINSCW" \
+            "DEFFILE $$defFilePath/bwins/$${TARGET}.def" \
+            "$${LITERAL_HASH}elif defined EABI" \
+            "DEFFILE $$defFilePath/eabi/$${TARGET}.def" \
+            "$${LITERAL_HASH}endif"
+        } else {
+            # If defFilePath is not defined, then put the folders containing the DEF files at the
+            # same level as the .pro (and generated MMP) file(s)
+            defBlock = \
+            "$${LITERAL_HASH}ifdef WINSCW" \
+            "DEFFILE ./bwins/$${TARGET}.def" \
+            "$${LITERAL_HASH}elif defined EABI" \
+            "DEFFILE ./eabi/$${TARGET}.def" \
+            "$${LITERAL_HASH}endif"
+        }
+        MMP_RULES += defBlock
+    }
 }
diff --git a/mkspecs/features/symbian/def_files_disabled.prf b/mkspecs/features/symbian/def_files_disabled.prf
index d5c9505..557c5e3 100644
--- a/mkspecs/features/symbian/def_files_disabled.prf
+++ b/mkspecs/features/symbian/def_files_disabled.prf
@@ -2,6 +2,12 @@
 
 CONFIG -= def_files
 
-# with EXPORTUNFROZEN enabled, new exports are included in the dll without
-# needing to run abld/sbs freeze
-MMP_RULES += EXPORTUNFROZEN
+# See def_files.prf for reasoning on the slight nastiness of this
+!contains(MMP_RULES, defBlock) {
+    # See def_files.prf for reasoning for excluding target types and configs below
+    !contains(TEMPLATE, app):!contains(CONFIG, plugin):!contains(CONFIG, staticlib): {
+        # with EXPORTUNFROZEN enabled, new exports are included in the dll and dso/lib without
+        # needing to run abld/sbs freeze
+        MMP_RULES += EXPORTUNFROZEN
+    }
+}