commit 8d35790281fe4548993682c37505d82e6384f820
Author: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Date:   Fri Aug 12 10:43:40 2011 +0100

    Enabled deployment of infixed binaries, for multimedia module

diff --git a/plugins/declarative/multimedia/multimedia.pro b/plugins/declarative/multimedia/multimedia.pro
index a5213d5..26498ab 100644
--- a/plugins/declarative/multimedia/multimedia.pro
+++ b/plugins/declarative/multimedia/multimedia.pro
@@ -5,7 +5,7 @@ INCLUDEPATH += ../../../src/global
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET  = $$qtLibraryTarget(declarative_multimedia)
+TARGET  = $$qtLibraryTarget(declarative_multimedia$${QT_LIBINFIX})
 TARGETPATH = QtMultimediaKit
 PLUGIN_TYPE = declarative
 include(../../../common.pri)
diff --git a/plugins/multimedia/m3u/m3u.pro b/plugins/multimedia/m3u/m3u.pro
index e6e64b8..4141845 100644
--- a/plugins/multimedia/m3u/m3u.pro
+++ b/plugins/multimedia/m3u/m3u.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtmultimediakit_m3u)
+TARGET = $$qtLibraryTarget(qtmultimediakit_m3u$${QT_LIBINFIX})
 
 PLUGIN_TYPE=playlistformats
 
diff --git a/plugins/multimedia/symbian/ecam/ecam.pro b/plugins/multimedia/symbian/ecam/ecam.pro
index 31f30b6..d7e452d 100644
--- a/plugins/multimedia/symbian/ecam/ecam.pro
+++ b/plugins/multimedia/symbian/ecam/ecam.pro
@@ -7,7 +7,7 @@
 TEMPLATE =      lib
 CONFIG +=       plugin
 
-TARGET =        $$qtLibraryTarget(qtmultimediakit_ecamengine)
+TARGET =        $$qtLibraryTarget(qtmultimediakit_ecamengine$${QT_LIBINFIX})
 PLUGIN_TYPE =   mediaservice
 include (../../../../common.pri)
 
diff --git a/plugins/multimedia/symbian/mmf/mmf.pro b/plugins/multimedia/symbian/mmf/mmf.pro
index 2bae03e..8fa1608 100644
--- a/plugins/multimedia/symbian/mmf/mmf.pro
+++ b/plugins/multimedia/symbian/mmf/mmf.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtmultimediakit_mmfengine)
+TARGET = $$qtLibraryTarget(qtmultimediakit_mmfengine$${QT_LIBINFIX})
 PLUGIN_TYPE = mediaservice
 include (../../../../common.pri)
 qtAddLibrary(QtMultimediaKit)
diff --git a/plugins/multimedia/symbian/openmaxal/openmaxal.pro b/plugins/multimedia/symbian/openmaxal/openmaxal.pro
index 0565536..89329bc 100644
--- a/plugins/multimedia/symbian/openmaxal/openmaxal.pro
+++ b/plugins/multimedia/symbian/openmaxal/openmaxal.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtmultimediakit_openmaxalengine)
+TARGET = $$qtLibraryTarget(qtmultimediakit_openmaxalengine$${QT_LIBINFIX})
 PLUGIN_TYPE = mediaservice
 include (../../../../common.pri)
 qtAddLibrary(QtMultimediaKit)
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 86ea251..a45a986 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -1,13 +1,19 @@
 TEMPLATE = subdirs
 
-isEmpty(QT_LIBINFIX):symbian {
+symbian {
     include(../../staticconfig.pri)
     load(data_caging_paths)
     include($$QT_MOBILITY_BUILD_TREE/config.pri)
 
     SUBDIRS =
-    TARGET = "QtMobility"
-    TARGET.UID3 = 0x2002ac89
+    TARGET = "QtMobility$${QT_LIBINFIX}"
+
+    isEmpty(QT_LIBINFIX) {
+        TARGET.UID3 = 0x2002ac89
+    } else {
+        # Always use experimental UID for infixed configuration to avoid UID clash
+        TARGET.UID3 = 0xe002ac89
+	}
 
     VERSION = 1.2.1
 
@@ -66,7 +72,7 @@ isEmpty(QT_LIBINFIX):symbian {
     #see $QTDIR/mkspecs/common/symbian/symbian.conf for details
     exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcppv5.dso) {
         pkg_version = $$replace(VERSION,"\\.",",")
-        qtmobilitydeployment.pkg_prerules += "$${LITERAL_HASH}{\"QtMobility\"},(0x2002AC89),$${pkg_version},TYPE=SA,RU,NR"
+        qtmobilitydeployment.pkg_prerules += "$${LITERAL_HASH}{\"QtMobility$${QT_LIBINFIX}\"},($${TARGET.UID3}),$${pkg_version},TYPE=SA,RU,NR"
     }
 
     contains(mobility_modules, messaging) {
@@ -387,11 +393,11 @@ isEmpty(QT_LIBINFIX):symbian {
     contains(mobility_modules, multimedia) {
 
         qtmobilitydeployment.sources += \
-            $$(EPOCROOT50)epoc32/release/$(PLATFORM)/$(TARGET)/QtMultimediaKit.dll \
-            $$(EPOCROOT50)epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_m3u.dll
+            $$(EPOCROOT50)epoc32/release/$(PLATFORM)/$(TARGET)/QtMultimediaKit$${QT_LIBINFIX}.dll \
+            $$(EPOCROOT50)epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_m3u$${QT_LIBINFIX}.dll
 
         pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/m3u/qmakepluginstubs/qtmultimediakit_m3u.qtplugin\"     - \"!:\\resource\\qt\\plugins\\playlistformats\\qtmultimediakit_m3u.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/m3u/qmakepluginstubs/qtmultimediakit_m3u$${QT_LIBINFIX}.qtplugin\"     - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\playlistformats\\qtmultimediakit_m3u$${QT_LIBINFIX}.qtplugin\""
 
         contains(openmaxal_symbian_enabled, yes) {
             openmax = \
@@ -400,58 +406,58 @@ isEmpty(QT_LIBINFIX):symbian {
             qtmobilitydeployment.pkg_postrules += openmax
 
             pluginstubs += \
-                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/openmaxal/qmakepluginstubs/qtmultimediakit_openmaxalengine.qtplugin\" - \"!:\\resource\\qt\\plugins\\mediaservice\\qtmultimediakit_openmaxalengine.qtplugin\""
+                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/openmaxal/qmakepluginstubs/qtmultimediakit_openmaxalengine$${QT_LIBINFIX}.qtplugin\" - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\mediaservice\\qtmultimediakit_openmaxalengine$${QT_LIBINFIX}.qtplugin\""
         } else {
 
             multimedia = \
                 "IF package(0x1028315F)" \
-                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_mmfengine.dll\" - \"!:\\sys\\bin\\qtmultimediakit_mmfengine.dll\"" \
+                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_mmfengine$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtmultimediakit_mmfengine$${QT_LIBINFIX}.dll\"" \
                 "ELSEIF package(0x102752AE)" \
-                "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_mmfengine.dll\" - \"!:\\sys\\bin\\qtmultimediakit_mmfengine.dll\"" \
+                "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_mmfengine$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtmultimediakit_mmfengine$${QT_LIBINFIX}.dll\"" \
                 "ELSEIF package(0x102032BE)" \
-                "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_mmfengine.dll\" - \"!:\\sys\\bin\\qtmultimediakit_mmfengine.dll\"" \
+                "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_mmfengine$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtmultimediakit_mmfengine$${QT_LIBINFIX}.dll\"" \
                 "ELSEIF package(0x20022E6D)" \
-                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_mmfengine.dll\" - \"!:\\sys\\bin\\qtmultimediakit_mmfengine.dll\"" \
+                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_mmfengine$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtmultimediakit_mmfengine$${QT_LIBINFIX}.dll\"" \
                 "ENDIF"
 
             qtmobilitydeployment.pkg_postrules += multimedia
 
             pluginstubs += \
                 "IF package(0x1028315F)" \
-                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/qtmultimediakit_mmfengine.qtplugin\" - \"!:\\resource\\qt\\plugins\\mediaservice\\qtmultimediakit_mmfengine.qtplugin\"" \
+                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/qtmultimediakit_mmfengine$${QT_LIBINFIX}.qtplugin\" - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\mediaservice\\qtmultimediakit_mmfengine$${QT_LIBINFIX}.qtplugin\"" \
                 "ELSEIF package(0x102752AE)" \
-                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/qtmultimediakit_mmfengine.qtplugin\" - \"!:\\resource\\qt\\plugins\\mediaservice\\qtmultimediakit_mmfengine.qtplugin\"" \
+                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/qtmultimediakit_mmfengine$${QT_LIBINFIX}.qtplugin\" - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\mediaservice\\qtmultimediakit_mmfengine$${QT_LIBINFIX}.qtplugin\"" \
                 "ELSEIF package(0x102032BE)" \
-                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/qtmultimediakit_mmfengine.qtplugin\" - \"!:\\resource\\qt\\plugins\\mediaservice\\qtmultimediakit_mmfengine.qtplugin\"" \
+                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/qtmultimediakit_mmfengine$${QT_LIBINFIX}.qtplugin\" - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\mediaservice\\qtmultimediakit_mmfengine$${QT_LIBINFIX}.qtplugin\"" \
                 "ELSEIF package(0x20022E6D)" \
-                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/qtmultimediakit_mmfengine.qtplugin\" - \"!:\\resource\\qt\\plugins\\mediaservice\\qtmultimediakit_mmfengine.qtplugin\"" \
+                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/qtmultimediakit_mmfengine$${QT_LIBINFIX}.qtplugin\" - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\mediaservice\\qtmultimediakit_mmfengine$${QT_LIBINFIX}.qtplugin\"" \
                 "ENDIF"
         }
 
         camera = \
             "IF package(0x1028315F)" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_ecamengine.dll\" - \"!:\\sys\\bin\\qtmultimediakit_ecamengine.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_ecamengine$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtmultimediakit_ecamengine$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x102752AE)" \
-            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_ecamengine.dll\" - \"!:\\sys\\bin\\qtmultimediakit_ecamengine.dll\"" \
+            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_ecamengine$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtmultimediakit_ecamengine$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x102032BE)" \
-            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_ecamengine.dll\" - \"!:\\sys\\bin\\qtmultimediakit_ecamengine.dll\"" \
+            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_ecamengine$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtmultimediakit_ecamengine$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x20022E6D)" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_ecamengine.dll\" - \"!:\\sys\\bin\\qtmultimediakit_ecamengine.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_ecamengine$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtmultimediakit_ecamengine$${QT_LIBINFIX}.dll\"" \
             "ENDIF"
 
         qtmobilitydeployment.pkg_postrules += camera
 
         pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/ecam/qmakepluginstubs/qtmultimediakit_ecamengine.qtplugin\" - \"!:\\resource\\qt\\plugins\\mediaservice\\qtmultimediakit_ecamengine.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/ecam/qmakepluginstubs/qtmultimediakit_ecamengine$${QT_LIBINFIX}.qtplugin\" - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\mediaservice\\qtmultimediakit_ecamengine$${QT_LIBINFIX}.qtplugin\""
 
 
     contains(QT_CONFIG, declarative): {
             qtmobilitydeployment.sources += \
-            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_multimedia.dll
+            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_multimedia$${QT_LIBINFIX}.dll
             pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\multimedia\\qmakepluginstubs\\declarative_multimedia.qtplugin\"  - \"!:\\resource\\qt\\imports\\QtMultimediaKit\\declarative_multimedia.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\multimedia\\qmakepluginstubs\\declarative_multimedia$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMultimediaKit\\declarative_multimedia$${QT_LIBINFIX}.qtplugin\""
             qmldirs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\multimedia\\qmldir\"  - \"!:\\resource\\qt\\imports\\QtMultimediaKit\\qmldir\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\multimedia\\qmldir\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMultimediaKit\\qmldir\""
         }
     }
 
@@ -509,6 +515,5 @@ isEmpty(QT_LIBINFIX):symbian {
 
     DEPLOYMENT += qtmobilitydeployment\
                 mobilitybackup
-} else {
-    message(Deployment of infixed library names not supported)
 }
+