Enabled deployment of infixed binaries on Symbian

Task-number: QTMOBILITY-1810
Reviewed-by: Miikka Heikkinen

35 files changed, 136 insertions, 80 deletions

diff --git a/plugins/contacts/serviceactionmanager/serviceactionmanager.pro b/plugins/contacts/serviceactionmanager/serviceactionmanager.pro
index 4310513498..9d210da8ed 100644
--- a/plugins/contacts/serviceactionmanager/serviceactionmanager.pro
+++ b/plugins/contacts/serviceactionmanager/serviceactionmanager.pro
@@ -1,6 +1,8 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtcontacts_serviceactionmanager)
+TARGET = $$mobilityPluginTarget(qtcontacts_serviceactionmanager)
 PLUGIN_TYPE=contacts
 
 include(../../../common.pri)
@@ -19,7 +21,7 @@ MOBILITY = contacts serviceframework
 symbian: {
     TARGET.CAPABILITY = ALL -TCB
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3=0x200315FD
+    TARGET.UID3 = $$mobilityUID(0x200315FD)
 
     target.path = /sys/bin
     INSTALLS += target
diff --git a/plugins/contacts/symbian/plugin/deploy.pri b/plugins/contacts/symbian/plugin/deploy.pri
deleted file mode 100644
index 365979cd3a..0000000000
--- a/plugins/contacts/symbian/plugin/deploy.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-PUBLIC_HEADERS += inc/cntbackendsdefs.h
-CONFIG += middleware
-include(../../../../features/deploy.pri)
\ No newline at end of file
diff --git a/plugins/contacts/symbian/plugin/plugin.pro b/plugins/contacts/symbian/plugin/plugin.pro
index f7d8877e07..a50eec1b0c 100644
--- a/plugins/contacts/symbian/plugin/plugin.pro
+++ b/plugins/contacts/symbian/plugin/plugin.pro
@@ -1,16 +1,19 @@
+include(../../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtcontacts_symbian)
+TARGET = $$mobilityPluginTarget(qtcontacts_symbian)
 PLUGIN_TYPE=contacts
 
 include(symbian_defines.pri)
-include(deploy.pri)
+PUBLIC_HEADERS += inc/cntbackendsdefs.h
+CONFIG += middleware
 symbian: { 
     load(data_caging_paths)
 
     TARGET.CAPABILITY = ALL -TCB
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3 = 0x2002AC7B
+    TARGET.UID3 = $$mobilityUID(0x2002AC7B)
   
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 	
diff --git a/plugins/contacts/symbiansim/symbiansim.pro b/plugins/contacts/symbiansim/symbiansim.pro
index 456600f206..062e3584f1 100644
--- a/plugins/contacts/symbiansim/symbiansim.pro
+++ b/plugins/contacts/symbiansim/symbiansim.pro
@@ -4,9 +4,11 @@
 #
 ######################################################################
 
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtcontacts_symbiansim)
+TARGET = $$mobilityPluginTarget(qtcontacts_symbiansim)
 PLUGIN_TYPE=contacts
 
 include(../../../common.pri)
@@ -17,7 +19,7 @@ symbian: {
     
     TARGET.CAPABILITY = ALL -TCB
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3 = 0x2002AC85
+    TARGET.UID3 = $$mobilityUID(0x2002AC85)
 
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
diff --git a/plugins/declarative/connectivity/connectivity.pro b/plugins/declarative/connectivity/connectivity.pro
index f5bba29f1b..be49e009e7 100644
--- a/plugins/declarative/connectivity/connectivity.pro
+++ b/plugins/declarative/connectivity/connectivity.pro
@@ -1,3 +1,5 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH += . \
                ../../../src/global \
                ../../../include \
@@ -7,7 +9,7 @@ INCLUDEPATH += . \
 
 DEPENDPATH += ../../../src/connectivity
 
-TARGET = $$qtLibraryTarget(declarative_connectivity)
+TARGET = $$mobilityPluginTarget(declarative_connectivity)
 TARGETPATH = QtMobility/connectivity
 
 TEMPLATE = lib
@@ -64,7 +66,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-#    TARGET.UID3 = 0x20021325
+#    TARGET.UID3 = $$mobilityUID(0x20021325)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_connectivity$${QT_LIBINFIX}.dll qmldir 
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/declarative/contacts/contacts.pro b/plugins/declarative/contacts/contacts.pro
index 721d79e79e..12f2a7606a 100644
--- a/plugins/declarative/contacts/contacts.pro
+++ b/plugins/declarative/contacts/contacts.pro
@@ -1,3 +1,5 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH += . \
                ../../../src/global \
                ../../../include \
@@ -10,7 +12,7 @@ DEPENDPATH += ../../../src/contacts
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(declarative_contacts)
+TARGET = $$mobilityPluginTarget(declarative_contacts)
 TARGETPATH = QtMobility/contacts
 DEFINES += QT_MAKEDLL
 PLUGIN_TYPE = declarative
@@ -67,7 +69,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x20021325
+    TARGET.UID3 = $$mobilityUID(0x20021325)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_contacts$${QT_LIBINFIX}.dll qmldir 
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/declarative/feedback/feedback.pro b/plugins/declarative/feedback/feedback.pro
index e8cdddc76e..a843d7703c 100644
--- a/plugins/declarative/feedback/feedback.pro
+++ b/plugins/declarative/feedback/feedback.pro
@@ -1,9 +1,11 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH += ../../../src/feedback
 INCLUDEPATH += ../../../src/global
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET  = $$qtLibraryTarget(declarative_feedback)
+TARGET  = $$mobilityPluginTarget(declarative_feedback)
 TARGETPATH = QtMobility/feedback
 PLUGIN_TYPE = declarative
 include(../../../common.pri)
@@ -38,7 +40,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x200315FC
+    TARGET.UID3 = $$mobilityUID(0x200315FC)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_feedback$${QT_LIBINFIX}.dll qmldir
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/declarative/gallery/gallery.pro b/plugins/declarative/gallery/gallery.pro
index 4e015fd988..159c44201b 100644
--- a/plugins/declarative/gallery/gallery.pro
+++ b/plugins/declarative/gallery/gallery.pro
@@ -1,3 +1,5 @@
+include(../../../features/utils.pri)
+
 DEPENDPATH += .
 INCLUDEPATH += . \
     ../../../include \
@@ -5,7 +7,7 @@ INCLUDEPATH += . \
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(declarative_gallery)
+TARGET = $$mobilityPluginTarget(declarative_gallery)
 TARGETPATH = QtMobility/gallery
 
 PLUGIN_TYPE = declarative
@@ -46,7 +48,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x2002BFCC
+    TARGET.UID3 = $$mobilityUID(0x2002BFCC)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_gallery$${QT_LIBINFIX}.dll qmldir 
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/declarative/location/location.pro b/plugins/declarative/location/location.pro
index 6378258926..445200b4a3 100644
--- a/plugins/declarative/location/location.pro
+++ b/plugins/declarative/location/location.pro
@@ -1,6 +1,8 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += qt plugin mobility
-TARGET  = $$qtLibraryTarget(declarative_location)
+TARGET  = $$mobilityPluginTarget(declarative_location)
 MOBILITY += location
 PLUGIN_TYPE = declarative
 QT += declarative network
@@ -104,7 +106,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x20033007
+    TARGET.UID3 = $$mobilityUID(0x20033007)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_location$${QT_LIBINFIX}.dll qmldir 
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/declarative/messaging/messaging.pro b/plugins/declarative/messaging/messaging.pro
index 5cc7c96dbc..faac908357 100644
--- a/plugins/declarative/messaging/messaging.pro
+++ b/plugins/declarative/messaging/messaging.pro
@@ -1,9 +1,11 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH += ../../../src/messaging
 INCLUDEPATH += ../../../src/global
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET  = $$qtLibraryTarget(declarative_messaging)
+TARGET  = $$mobilityPluginTarget(declarative_messaging)
 TARGETPATH = QtMobility/messaging
 PLUGIN_TYPE = declarative
 
@@ -41,7 +43,7 @@ simulator|contains(qmf_enabled, yes) {
             CONFIG += link_pkgconfig
             PKGCONFIG += qmfclient
         } else {
-            LIBS += -L$$(QMF_LIBDIR) -l$$qtLibraryTarget(qmfclient)
+            LIBS += -L$$(QMF_LIBDIR) -l$$mobilityPluginTarget(qmfclient)
         }
     }
 }
@@ -52,7 +54,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x20031601
+    TARGET.UID3 = $$mobilityUID(0x20031601)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_messaging$${QT_LIBINFIX}.dll qmldir
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/declarative/multimedia/multimedia.pro b/plugins/declarative/multimedia/multimedia.pro
index a5213d5d8a..2777560467 100644
--- a/plugins/declarative/multimedia/multimedia.pro
+++ b/plugins/declarative/multimedia/multimedia.pro
@@ -1,3 +1,5 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH += ../../../src/multimedia \
                ../../../src/multimedia/effects \
                ../../../src/multimedia/video
@@ -5,7 +7,7 @@ INCLUDEPATH += ../../../src/global
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET  = $$qtLibraryTarget(declarative_multimedia)
+TARGET  = $$mobilityPluginTarget(declarative_multimedia)
 TARGETPATH = QtMultimediaKit
 PLUGIN_TYPE = declarative
 include(../../../common.pri)
@@ -41,7 +43,7 @@ INSTALLS += qmldir
 symbian {
     # In Symbian, a library should enjoy _largest_ possible capability set.
     TARGET.CAPABILITY = ALL -TCB
-    TARGET.UID3 = 0x20021313
+    TARGET.UID3 = $$mobilityUID(0x20021313)
     TARGET.EPOCALLOWDLLDATA=1
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_multimedia$${QT_LIBINFIX}.dll qmldir 
diff --git a/plugins/declarative/organizer/organizer.pro b/plugins/declarative/organizer/organizer.pro
index 34aa3f0ffd..f1742ce6c8 100644
--- a/plugins/declarative/organizer/organizer.pro
+++ b/plugins/declarative/organizer/organizer.pro
@@ -1,3 +1,5 @@
+include(../../../features/utils.pri)
+
 DEPENDPATH += .
 INCLUDEPATH += . \
     ../../../include \
@@ -11,7 +13,7 @@ INCLUDEPATH += . \
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(declarative_organizer)
+TARGET = $$mobilityPluginTarget(declarative_organizer)
 TARGETPATH = QtMobility/organizer
 DEFINES += QT_MAKEDLL
 PLUGIN_TYPE = declarative
@@ -67,7 +69,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x20021326
+    TARGET.UID3 = $$mobilityUID(0x20021326)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_organizer$${QT_LIBINFIX}.dll qmldir 
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/declarative/publishsubscribe/publishsubscribe.pro b/plugins/declarative/publishsubscribe/publishsubscribe.pro
index 37224dbb8f..63a8d88d6e 100644
--- a/plugins/declarative/publishsubscribe/publishsubscribe.pro
+++ b/plugins/declarative/publishsubscribe/publishsubscribe.pro
@@ -1,10 +1,12 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH += ../../../src/publishsubscribe
 DEPENDPATH += ../../../src/publishsubscribe
 INCLUDEPATH += ../../../src/global
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET  = $$qtLibraryTarget(declarative_publishsubscribe)
+TARGET  = $$mobilityPluginTarget(declarative_publishsubscribe)
 TARGETPATH = QtMobility/publishsubscribe
 PLUGIN_TYPE = declarative
 DEFINES += QT_MAKEDLL
@@ -41,7 +43,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x20021322
+    TARGET.UID3 = $$mobilityUID(0x20021322)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_publishsubscribe$${QT_LIBINFIX}.dll qmldir
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/declarative/sensors/sensors.pro b/plugins/declarative/sensors/sensors.pro
index 996b90c846..6503b53619 100644
--- a/plugins/declarative/sensors/sensors.pro
+++ b/plugins/declarative/sensors/sensors.pro
@@ -1,9 +1,11 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH += ../../../src/sensors
 INCLUDEPATH += ../../../src/global
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET  = $$qtLibraryTarget(declarative_sensors)
+TARGET  = $$mobilityPluginTarget(declarative_sensors)
 TARGETPATH = QtMobility/sensors
 PLUGIN_TYPE = declarative
 include(../../../common.pri)
@@ -28,7 +30,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x20021324
+    TARGET.UID3 = $$mobilityUID(0x20021324)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_sensors$${QT_LIBINFIX}.dll qmldir 
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/declarative/serviceframework/serviceframework.pro b/plugins/declarative/serviceframework/serviceframework.pro
index da048d3e52..6bb4d75788 100644
--- a/plugins/declarative/serviceframework/serviceframework.pro
+++ b/plugins/declarative/serviceframework/serviceframework.pro
@@ -1,10 +1,12 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH += ../../../src/serviceframework
 INCLUDEPATH += ../../../src/global
 INCLUDEPATH += .
 
 TEMPLATE = lib
 CONFIG += qt plugin
-TARGET  = $$qtLibraryTarget(declarative_serviceframework)
+TARGET  = $$mobilityPluginTarget(declarative_serviceframework)
 TARGETPATH = QtMobility/serviceframework
 PLUGIN_TYPE = declarative
 include(../../../common.pri)
@@ -29,7 +31,7 @@ INSTALLS += qmldir
 symbian {
     TARGET.EPOCALLOWDLLDATA=1
     TARGET.CAPABILITY = All -Tcb
-    TARGET.UID3 = 0x20021323
+    TARGET.UID3 = $$mobilityUID(0x20021323)
     load(armcc_warnings)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_serviceframework$${QT_LIBINFIX}.dll qmldir 
diff --git a/plugins/declarative/systeminfo/systeminfo.pro b/plugins/declarative/systeminfo/systeminfo.pro
index a567acad01..4d98fdfc7e 100644
--- a/plugins/declarative/systeminfo/systeminfo.pro
+++ b/plugins/declarative/systeminfo/systeminfo.pro
@@ -1,10 +1,12 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH += ../../../src/systeminfo
 DEPENDPATH += ../../../src/systeminfo
 INCLUDEPATH += ../../../src/global
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET  = $$qtLibraryTarget(declarative_systeminfo)
+TARGET  = $$mobilityPluginTarget(declarative_systeminfo)
 TARGETPATH = QtMobility/systeminfo
 PLUGIN_TYPE = declarative
 include(../../../common.pri)
@@ -45,7 +47,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x200315F9
+    TARGET.UID3 = $$mobilityUID(0x200315F9)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_systeminfo$${QT_LIBINFIX}.dll qmldir
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/feedback/immersion/immersion.pro b/plugins/feedback/immersion/immersion.pro
index f16e78245d..c1adb1c075 100644
--- a/plugins/feedback/immersion/immersion.pro
+++ b/plugins/feedback/immersion/immersion.pro
@@ -1,7 +1,9 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
 QT = core
-TARGET = $$qtLibraryTarget(qtfeedback_immersion)
+TARGET = $$mobilityPluginTarget(qtfeedback_immersion)
 PLUGIN_TYPE=feedback
 
 include(../../../common.pri)
@@ -18,7 +20,6 @@ MOBILITY = feedback
 symbian: {
     TARGET.EPOCALLOWDLLDATA=1
     TARGET.CAPABILITY = All -Tcb
-    TARGET = $${TARGET}$${QT_LIBINFIX}
     load(armcc_warnings)
 
     target.path = /sys/bin
diff --git a/plugins/feedback/mmk/mmk.pro b/plugins/feedback/mmk/mmk.pro
index 56d68c68f8..7eb7cb3037 100644
--- a/plugins/feedback/mmk/mmk.pro
+++ b/plugins/feedback/mmk/mmk.pro
@@ -1,6 +1,8 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtfeedback_mmk)
+TARGET = $$mobilityPluginTarget(qtfeedback_mmk)
 PLUGIN_TYPE=feedback
 
 include(../../../common.pri)
@@ -16,8 +18,7 @@ MOBILITY = feedback multimedia
 symbian: {
     TARGET.EPOCALLOWDLLDATA=1
     TARGET.CAPABILITY = All -Tcb
-    TARGET.UID3 = 0x200315FF
-    TARGET = $${TARGET}$${QT_LIBINFIX}
+    TARGET.UID3 = $$mobilityUID(0x200315FF)
     load(armcc_warnings)
 
     target.path = /sys/bin
diff --git a/plugins/feedback/symbian/symbian.pro b/plugins/feedback/symbian/symbian.pro
index 1cd2c5c612..0de6bc5eda 100644
--- a/plugins/feedback/symbian/symbian.pro
+++ b/plugins/feedback/symbian/symbian.pro
@@ -1,6 +1,8 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtfeedback_symbian)
+TARGET = $$mobilityPluginTarget(qtfeedback_symbian)
 PLUGIN_TYPE=feedback
 
 include(../../../common.pri)
@@ -48,8 +50,7 @@ symbian {
 
     TARGET.EPOCALLOWDLLDATA=1
     TARGET.CAPABILITY = All -Tcb
-    TARGET.UID3=0x200315FE
-    TARGET = $${TARGET}$${QT_LIBINFIX}
+    TARGET.UID3 = $$mobilityUID(0x200315FE)
 
     load(armcc_warnings)
 
diff --git a/plugins/geoservices/nokia/nokia.pro b/plugins/geoservices/nokia/nokia.pro
index 1b2e050e0b..997a5ab7f2 100644
--- a/plugins/geoservices/nokia/nokia.pro
+++ b/plugins/geoservices/nokia/nokia.pro
@@ -1,6 +1,8 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtgeoservices_nokia)
+TARGET = $$mobilityPluginTarget(qtgeoservices_nokia)
 PLUGIN_TYPE=geoservices
 
 include(../../../common.pri)
@@ -45,7 +47,7 @@ INCLUDEPATH += $$SOURCE_DIR/src/location \
 symbian {
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = ALL -TCB
-    TARGET.UID3 = 0x2002BFCA
+    TARGET.UID3 = $$mobilityUID(0x2002BFCA)
     pluginDep.sources = $${TARGET}.dll
     pluginDep.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE}
     DEPLOYMENT += pluginDep      
diff --git a/plugins/landmarks/symbian_landmarks/symbian_landmarks.pro b/plugins/landmarks/symbian_landmarks/symbian_landmarks.pro
index 8fe9284a11..2bb9b1c94b 100644
--- a/plugins/landmarks/symbian_landmarks/symbian_landmarks.pro
+++ b/plugins/landmarks/symbian_landmarks/symbian_landmarks.pro
@@ -39,15 +39,17 @@
 #
 ##########################################################################
 
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
 QT += core
-TARGET = $$qtLibraryTarget(qtlandmarks_symbian)
+TARGET = $$mobilityPluginTarget(qtlandmarks_symbian)
 PLUGIN_TYPE=landmarks
 CONFIG += mobility
 MOBILITY = location
-
 include(../../../common.pri)
+
 include(symbian_landmarks_defines.pri)
 
 symbian {
@@ -56,7 +58,7 @@ symbian {
         INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
         TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = ALL -TCB
-    TARGET.UID3 = 0x20031E8F
+    TARGET.UID3 = $$mobilityUID(0x20031E8F)
 
     LIBS += \
         -lflogger \
diff --git a/plugins/multimedia/m3u/m3u.pro b/plugins/multimedia/m3u/m3u.pro
index e6e64b875c..227e34919a 100644
--- a/plugins/multimedia/m3u/m3u.pro
+++ b/plugins/multimedia/m3u/m3u.pro
@@ -1,6 +1,8 @@
+include (../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtmultimediakit_m3u)
+TARGET = $$mobilityPluginTarget(qtmultimediakit_m3u)
 
 PLUGIN_TYPE=playlistformats
 
@@ -17,7 +19,7 @@ HEADERS += qm3uhandler.h
 SOURCES += main.cpp \
            qm3uhandler.cpp
 symbian {
-    TARGET.UID3 = 0x2002BFC7
+    TARGET.UID3 = $$mobilityUID(0x2002BFC7)
     TARGET.CAPABILITY = ALL -TCB
     TARGET.EPOCALLOWDLLDATA = 1
     
diff --git a/plugins/multimedia/symbian/ecam/ecam.pro b/plugins/multimedia/symbian/ecam/ecam.pro
index 31f30b61cd..2706b86ed9 100644
--- a/plugins/multimedia/symbian/ecam/ecam.pro
+++ b/plugins/multimedia/symbian/ecam/ecam.pro
@@ -4,10 +4,12 @@
 #
 ######################################################################
 
+include (../../../../features/utils.pri)
+
 TEMPLATE =      lib
 CONFIG +=       plugin
 
-TARGET =        $$qtLibraryTarget(qtmultimediakit_ecamengine)
+TARGET =        $$mobilityPluginTarget(qtmultimediakit_ecamengine)
 PLUGIN_TYPE =   mediaservice
 include (../../../../common.pri)
 
@@ -31,7 +33,7 @@ SOURCES += s60cameraserviceplugin.cpp
 
 load(data_caging_paths)
 TARGET.EPOCALLOWDLLDATA =   1
-TARGET.UID3 =               0x2002BFC2
+TARGET.UID3 =               $$mobilityUID(0x2002BFC2)
 TARGET.CAPABILITY =         ALL -TCB
 
 # Make a sis package from plugin + api + stub (plugin)
diff --git a/plugins/multimedia/symbian/mmf/mmf.pro b/plugins/multimedia/symbian/mmf/mmf.pro
index 4b335c194f..8543d2d094 100644
--- a/plugins/multimedia/symbian/mmf/mmf.pro
+++ b/plugins/multimedia/symbian/mmf/mmf.pro
@@ -1,7 +1,9 @@
+include (../../../../features/utils.pri)
+
 TEMPLATE = lib
 
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtmultimediakit_mmfengine)
+TARGET = $$mobilityPluginTarget(qtmultimediakit_mmfengine)
 PLUGIN_TYPE = mediaservice
 include (../../../../common.pri)
 qtAddLibrary(QtMultimediaKit)
@@ -42,7 +44,7 @@ contains(mmf_http_cookies_enabled, yes) {
 }
 load(data_caging_paths)
 TARGET.EPOCALLOWDLLDATA = 1
-TARGET.UID3=0x2002AC76
+TARGET.UID3 = $$mobilityUID(0x2002AC76)
 TARGET.CAPABILITY = ALL -TCB
 MMP_RULES += EXPORTUNFROZEN
 
@@ -51,8 +53,3 @@ pluginDep.sources = $${TARGET}.dll
 pluginDep.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE}
 DEPLOYMENT += pluginDep
 
-#Media API spesific deployment
-QtMediaDeployment.sources = QtMultimediaKit.dll
-QtMediaDeployment.path = /sys/bin
-
-DEPLOYMENT += QtMediaDeployment
diff --git a/plugins/multimedia/symbian/openmaxal/openmaxal.pro b/plugins/multimedia/symbian/openmaxal/openmaxal.pro
index 0565536a4e..9986ff1a9c 100644
--- a/plugins/multimedia/symbian/openmaxal/openmaxal.pro
+++ b/plugins/multimedia/symbian/openmaxal/openmaxal.pro
@@ -1,7 +1,9 @@
+include (../../../../features/utils.pri)
+
 TEMPLATE = lib
 
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtmultimediakit_openmaxalengine)
+TARGET = $$mobilityPluginTarget(qtmultimediakit_openmaxalengine)
 PLUGIN_TYPE = mediaservice
 include (../../../../common.pri)
 qtAddLibrary(QtMultimediaKit)
@@ -26,7 +28,7 @@ SYMBIAN_PLATFORMS = DEFAULT
 # Input parameters for the generated mmp file
 # -------------------------------------------
 load(data_caging_paths)
-TARGET.UID3 = 0x10207CA1
+TARGET.UID3 = $$mobilityUID(0x10207CA1)
 TARGET.CAPABILITY = ALL -TCB
 TARGET.EPOCALLOWDLLDATA = 1
 MMP_RULES += EXPORTUNFROZEN
diff --git a/plugins/organizer/symbian/symbian.pro b/plugins/organizer/symbian/symbian.pro
index eceee11de2..4edae26e9f 100644
--- a/plugins/organizer/symbian/symbian.pro
+++ b/plugins/organizer/symbian/symbian.pro
@@ -1,6 +1,8 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtorganizer_symbian)
+TARGET = $$mobilityPluginTarget(qtorganizer_symbian)
 PLUGIN_TYPE=organizer
 
 # support for S^4-specific types
@@ -24,7 +26,7 @@ symbian: {
 
     TARGET.CAPABILITY = ALL -TCB
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3 = 0x2002BFC9
+    TARGET.UID3 = $$mobilityUID(0x2002BFC9)
   
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
     INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
diff --git a/plugins/sensors/generic/generic.pro b/plugins/sensors/generic/generic.pro
index d4745e6858..5ebac60bcb 100644
--- a/plugins/sensors/generic/generic.pro
+++ b/plugins/sensors/generic/generic.pro
@@ -1,17 +1,19 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH+=../../../src/sensors
 
 PLUGIN_TYPE = sensors
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtsensors_generic)
+TARGET = $$mobilityPluginTarget(qtsensors_generic)
 
 include(generic.pri)
 include(../../../common.pri)
 
 symbian {
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3 = 0x2002BFC3
+    TARGET.UID3 = $$mobilityUID(0x2002BFC3)
     TARGET.CAPABILITY = ALL -TCB
 
     pluginDep.sources = $${TARGET}.dll
diff --git a/plugins/sensors/s60_sensor_api/s60_sensor_api.pro b/plugins/sensors/s60_sensor_api/s60_sensor_api.pro
index 06b94377c7..d7788fd161 100644
--- a/plugins/sensors/s60_sensor_api/s60_sensor_api.pro
+++ b/plugins/sensors/s60_sensor_api/s60_sensor_api.pro
@@ -10,7 +10,7 @@ include(s60_sensor_api.pri)
 
 TARGET = $$qtLibraryTarget(qtsensors_sym)
 TARGET.EPOCALLOWDLLDATA = 1
-TARGET.UID3 = 0x2002BFC1
+TARGET.UID3 = $$mobilityUID(0x2002BFC1)
 TARGET.CAPABILITY = ALL -TCB
 
 QT=core
diff --git a/plugins/sensors/symbian/symbian.pro b/plugins/sensors/symbian/symbian.pro
index b4a8da6322..2300dfb45d 100644
--- a/plugins/sensors/symbian/symbian.pro
+++ b/plugins/sensors/symbian/symbian.pro
@@ -1,10 +1,12 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH+=$$(EPOCROOT)epoc32/include/osextensions
 
 PLUGIN_TYPE = sensors
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtsensors_sym)
+TARGET = $$mobilityPluginTarget(qtsensors_sym)
 
 include(../../../common.pri)
 
@@ -44,7 +46,7 @@ MOBILITY+=sensors
 
 symbian {
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3 = 0x2002BFC8
+    TARGET.UID3 = $$mobilityUID(0x2002BFC8)
     TARGET.CAPABILITY = ALL -TCB
     LIBS += -lsensrvclient
     LIBS += -lsensrvutil
diff --git a/plugins/versit/backuphandler/backuphandler.pro b/plugins/versit/backuphandler/backuphandler.pro
index 7e7e067444..270016cd76 100644
--- a/plugins/versit/backuphandler/backuphandler.pro
+++ b/plugins/versit/backuphandler/backuphandler.pro
@@ -1,6 +1,8 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtversit_backuphandler)
+TARGET = $$mobilityPluginTarget(qtversit_backuphandler)
 PLUGIN_TYPE=versit
 
 include(../../../common.pri)
@@ -20,7 +22,7 @@ MOBILITY = versit contacts
 symbian {
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = ALL -Tcb
-    TARGET.UID3 = 0x20031600
+    TARGET.UID3 = $$mobilityUID(0x20031600)
 
     target.path = /sys/bin
     INSTALLS += target
diff --git a/plugins/versit/symbian/versitplugins/cntversitfavoriteplugin/cntversitfavoriteplugin.pro b/plugins/versit/symbian/versitplugins/cntversitfavoriteplugin/cntversitfavoriteplugin.pro
index 665e9be52e..c65390900c 100644
--- a/plugins/versit/symbian/versitplugins/cntversitfavoriteplugin/cntversitfavoriteplugin.pro
+++ b/plugins/versit/symbian/versitplugins/cntversitfavoriteplugin/cntversitfavoriteplugin.pro
@@ -1,6 +1,8 @@
+include(../../../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(cntversitfavoriteplugin)
+TARGET = $$mobilityPluginTarget(cntversitfavoriteplugin)
 PLUGIN_TYPE = versit
 
 include(../../../../../common.pri)
@@ -25,7 +27,7 @@ MOBILITY = versit contacts
 
 symbian {
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3 = 0x20034590
+    TARGET.UID3 = $$mobilityUID(0x20034590)
     TARGET.CAPABILITY = ALL -TCB
 
     pluginDep.sources = $${TARGET}.dll
diff --git a/plugins/versit/symbian/versitplugins/cntversitlandlineplugin/cntversitlandlineplugin.pro b/plugins/versit/symbian/versitplugins/cntversitlandlineplugin/cntversitlandlineplugin.pro
index 29bfa69153..573515b7dd 100644
--- a/plugins/versit/symbian/versitplugins/cntversitlandlineplugin/cntversitlandlineplugin.pro
+++ b/plugins/versit/symbian/versitplugins/cntversitlandlineplugin/cntversitlandlineplugin.pro
@@ -1,6 +1,8 @@
+include(../../../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(cntversitlandlineplugin)
+TARGET = $$mobilityPluginTarget(cntversitlandlineplugin)
 PLUGIN_TYPE = versit
 
 include(../../../../../common.pri)
@@ -27,7 +29,7 @@ MOBILITY = versit \
 
 symbian { 
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3 = 0x2003458F
+    TARGET.UID3 = $$mobilityUID(0x2003458F)
     TARGET.CAPABILITY = ALL -TCB
     
     pluginDep.sources = $${TARGET}.dll
diff --git a/plugins/versit/symbian/versitplugins/cntversitmycardplugin/cntversitmycardplugin.pro b/plugins/versit/symbian/versitplugins/cntversitmycardplugin/cntversitmycardplugin.pro
index c616446997..50152ab7bd 100644
--- a/plugins/versit/symbian/versitplugins/cntversitmycardplugin/cntversitmycardplugin.pro
+++ b/plugins/versit/symbian/versitplugins/cntversitmycardplugin/cntversitmycardplugin.pro
@@ -1,6 +1,8 @@
+include(../../../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(cntversitmycardplugin)
+TARGET = $$mobilityPluginTarget(cntversitmycardplugin)
 PLUGIN_TYPE = versit
 
 include(../../../../../common.pri)
@@ -28,7 +30,7 @@ MOBILITY = versit \
 
 symbian {
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3 = 0x20034591
+    TARGET.UID3 = $$mobilityUID(0x20034591)
     TARGET.CAPABILITY = ALL -TCB
 
     pluginDep.sources = $${TARGET}.dll
diff --git a/plugins/versit/symbian/versitplugins/cntversitprefplugin/cntversitprefplugin.pro b/plugins/versit/symbian/versitplugins/cntversitprefplugin/cntversitprefplugin.pro
index e9f006c123..8f377c53fd 100644
--- a/plugins/versit/symbian/versitplugins/cntversitprefplugin/cntversitprefplugin.pro
+++ b/plugins/versit/symbian/versitplugins/cntversitprefplugin/cntversitprefplugin.pro
@@ -1,6 +1,8 @@
+include(../../../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(cntversitprefplugin)
+TARGET = $$mobilityPluginTarget(cntversitprefplugin)
 PLUGIN_TYPE = versit
 
 include(../../../../../common.pri)
@@ -26,7 +28,7 @@ MOBILITY = versit contacts
 
 symbian {
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3 = 0x2003458E
+    TARGET.UID3 = $$mobilityUID(0x2003458E)
     TARGET.CAPABILITY = ALL -TCB
     
     pluginDep.sources = $${TARGET}.dll
diff --git a/plugins/versit/vcardpreserver/vcardpreserver.pro b/plugins/versit/vcardpreserver/vcardpreserver.pro
index 41e7efea68..023d4aa52e 100644
--- a/plugins/versit/vcardpreserver/vcardpreserver.pro
+++ b/plugins/versit/vcardpreserver/vcardpreserver.pro
@@ -1,6 +1,8 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtversit_vcardpreserver)
+TARGET = $$mobilityPluginTarget(qtversit_vcardpreserver)
 PLUGIN_TYPE=versit
 
 include(../../../common.pri)
@@ -20,7 +22,7 @@ MOBILITY = versit contacts
 symbian {
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = ALL -Tcb
-    TARGET.UID3 = 0x20031602
+    TARGET.UID3 = $$mobilityUID(0x20031602)
 
     target.path = /sys/bin
     INSTALLS += target