Rename libraries for the beta release.

Change all .pro files to use

CONFIG += mobility
MOBILITY = foo

instead of qtAddLibrary().

123 files changed, 256 insertions, 135 deletions

diff --git a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.pro b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.pro
index 09e3af145f..acd0c1fd1e 100644
--- a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.pro
+++ b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.pro
@@ -14,7 +14,9 @@ INCLUDEPATH += ../../../../src/contacts \
 
 DESTDIR = $$QT_MOBILITY_BUILD_TREE/bin/examples
 QMAKE_RPATHDIR+=$$OUTPUT_DIR/lib
-qtAddLibrary(QtContacts)
+
+CONFIG += mobility
+MOBILITY = contacts
 
 SOURCES += qtcontactsdocsample.cpp
 HEADERS += requestexample.h
diff --git a/examples/audiorecorder/audiorecorder.pro b/examples/audiorecorder/audiorecorder.pro
index 83358990b9..0475ec3490 100644
--- a/examples/audiorecorder/audiorecorder.pro
+++ b/examples/audiorecorder/audiorecorder.pro
@@ -6,7 +6,8 @@ contains(QT_CONFIG, multimedia): QT += multimedia
 INCLUDEPATH += ../../src/multimedia
 include(../examples.pri)
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
 QMAKE_RPATHDIR += $$DESTDIR
 
diff --git a/examples/battery-charge/battery-consumer/battery-consumer.pro b/examples/battery-charge/battery-consumer/battery-consumer.pro
index 543832b47d..2562ef9957 100644
--- a/examples/battery-charge/battery-consumer/battery-consumer.pro
+++ b/examples/battery-charge/battery-consumer/battery-consumer.pro
@@ -4,7 +4,8 @@ QT += declarative
 INCLUDEPATH += ../../../src/publishsubscribe
 DEPENDPATH += ../../../src/publishsubscribe
 include(../../examples.pri)
-qtAddLibrary(QtPublishSubscribe)
+CONFIG += mobility
+MOBILITY = publishsubscribe
 SOURCES = main.cpp
 RESOURCES = battery-consumer.qrc
 OTHER_FILES += battery-meter.qml
diff --git a/examples/battery-charge/battery-provider/battery-provider.pro b/examples/battery-charge/battery-provider/battery-provider.pro
index 5dfcec9d0b..092f2192e9 100644
--- a/examples/battery-charge/battery-provider/battery-provider.pro
+++ b/examples/battery-charge/battery-provider/battery-provider.pro
@@ -11,4 +11,5 @@ SOURCES = main.cpp \
 FORMS = batteryprovider.ui
 
 include(../../examples.pri)
-qtAddLibrary(QtPublishSubscribe)
+CONFIG += mobility
+MOBILITY = publishsubscribe
diff --git a/examples/bearercloud/bearercloud.pro b/examples/bearercloud/bearercloud.pro
index 1471be46c0..133fbbbb4b 100644
--- a/examples/bearercloud/bearercloud.pro
+++ b/examples/bearercloud/bearercloud.pro
@@ -15,7 +15,8 @@ INCLUDEPATH += ../../src/bearer
 
 include(../examples.pri)
 
-qtAddLibrary(QtBearer)
+CONFIG += mobility
+MOBILITY = bearer
 
 CONFIG += console
 
diff --git a/examples/bearermonitor/bearermonitor.pro b/examples/bearermonitor/bearermonitor.pro
index 019df1e316..0cb380e6be 100644
--- a/examples/bearermonitor/bearermonitor.pro
+++ b/examples/bearermonitor/bearermonitor.pro
@@ -17,7 +17,9 @@ INCLUDEPATH += ../../src/bearer
 
 include(../examples.pri)
 
-qtAddLibrary(QtBearer)
+CONFIG += mobility
+MOBILITY = bearer
+
 win32:!wince*:LIBS += -lWs2_32
 wince*:LIBS += -lWs2
 
diff --git a/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro b/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro
index 7329503c0c..b483c018d8 100644
--- a/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro
+++ b/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro
@@ -9,7 +9,8 @@ TARGET = serviceframework_bluetoothtransferplugin
 DESTDIR = .
 
 include(../examples.pri)
-qtAddLibrary(QtServiceFramework)
+CONFIG += mobility
+MOBILITY = serviceframework
 
 symbian {
     load(data_caging_paths)
diff --git a/examples/cameracapture/cameracapture.pro b/examples/cameracapture/cameracapture.pro
index f27c764163..9ec7c9e094 100644
--- a/examples/cameracapture/cameracapture.pro
+++ b/examples/cameracapture/cameracapture.pro
@@ -4,7 +4,8 @@ TARGET = cameracapture
 INCLUDEPATH+=../../src/multimedia
 include(../examples.pri)
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
 HEADERS = cameracapture.h \
     settings.h
diff --git a/examples/declarative/demo/demo.pro b/examples/declarative/demo/demo.pro
index c6fd190e84..45ee0d9eae 100644
--- a/examples/declarative/demo/demo.pro
+++ b/examples/declarative/demo/demo.pro
@@ -11,7 +11,8 @@ HEADERS += ../sfwexample.h
 SOURCES += ../sfwexample.cpp \
            ../main.cpp
 
-qtAddLibrary(QtServiceFramework)
+CONFIG += mobility
+MOBILITY = serviceframework
 
 symbian {
     TARGET.CAPABILITY = ALL -TCB
diff --git a/examples/declarative/landlinedialer/landlinedialer.pro b/examples/declarative/landlinedialer/landlinedialer.pro
index d65b35bb84..6459d4c04f 100644
--- a/examples/declarative/landlinedialer/landlinedialer.pro
+++ b/examples/declarative/landlinedialer/landlinedialer.pro
@@ -10,7 +10,8 @@ QT += gui
 HEADERS += landlinedialer.h landlinedialerplugin.h
 SOURCES += landlinedialer.cpp landlinedialerplugin.cpp
 
-qtAddLibrary(QtServiceFramework)
+CONFIG += mobility
+MOBILITY = serviceframework
 
 symbian {
     TARGET.CAPABILITY = ALL -TCB
diff --git a/examples/declarative/voipdialer/voipdialer.pro b/examples/declarative/voipdialer/voipdialer.pro
index 099f152afc..372e5fb87c 100644
--- a/examples/declarative/voipdialer/voipdialer.pro
+++ b/examples/declarative/voipdialer/voipdialer.pro
@@ -10,7 +10,8 @@ QT += gui
 HEADERS += voipdialer.h voipdialerplugin.h
 SOURCES += voipdialer.cpp voipdialerplugin.cpp
 
-qtAddLibrary(QtServiceFramework)
+CONFIG += mobility
+MOBILITY = serviceframework
 
 symbian {
     TARGET.CAPABILITY = ALL -TCB
diff --git a/examples/fetchgooglemaps/fetchgooglemaps.pro b/examples/fetchgooglemaps/fetchgooglemaps.pro
index bb2534322a..1bdcbd3ba3 100644
--- a/examples/fetchgooglemaps/fetchgooglemaps.pro
+++ b/examples/fetchgooglemaps/fetchgooglemaps.pro
@@ -8,7 +8,8 @@ SOURCES = mapwindow.cpp \
           main.cpp
 
 include(../examples.pri)
-qtAddLibrary(QtLocation)
+CONFIG += mobility
+MOBILITY = location
 
 logfile.path = $$DESTDIR
 logfile.files = nmealog.txt
diff --git a/examples/filemanagerplugin/filemanagerplugin.pro b/examples/filemanagerplugin/filemanagerplugin.pro
index 1d66a01ef8..7dd28fc68f 100644
--- a/examples/filemanagerplugin/filemanagerplugin.pro
+++ b/examples/filemanagerplugin/filemanagerplugin.pro
@@ -11,7 +11,8 @@ TARGET = serviceframework_filemanagerplugin
 DESTDIR = .
 
 include(../examples.pri)
-qtAddLibrary(QtServiceFramework)
+CONFIG += mobility
+MOBILITY = serviceframework
 
 symbian {
     load(data_caging_paths)
diff --git a/examples/incomingcalls/incomingcalls.pro b/examples/incomingcalls/incomingcalls.pro
index 880ef6d8c9..6e89dddc42 100644
--- a/examples/incomingcalls/incomingcalls.pro
+++ b/examples/incomingcalls/incomingcalls.pro
@@ -13,7 +13,8 @@ INCLUDEPATH += . ../../src/contacts \
                ../../src/contacts/filters
 
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 
 # Input
 SOURCES += main.cpp \
@@ -26,5 +27,4 @@ HEADERS += testmodelui.h \
            qcontactlistmodel.h \
            qcontactlistmodel_p.h
 
-qtAddLibrary(QtContacts)
 include(../examples.pri)
diff --git a/examples/keepintouch/keepintouch.pro b/examples/keepintouch/keepintouch.pro
index 3aa397fc27..4a19707259 100644
--- a/examples/keepintouch/keepintouch.pro
+++ b/examples/keepintouch/keepintouch.pro
@@ -5,7 +5,8 @@ QT += gui
 
 include(../examples.pri)
 
-qtAddLibrary(QtMessaging)
+CONFIG += mobility
+MOBILITY = messaging
 INCLUDEPATH += ../../src/messaging
 
 symbian|win32 {
diff --git a/examples/logfilepositionsource/logfilepositionsource.pro b/examples/logfilepositionsource/logfilepositionsource.pro
index 05e15a4927..e938b188f2 100644
--- a/examples/logfilepositionsource/logfilepositionsource.pro
+++ b/examples/logfilepositionsource/logfilepositionsource.pro
@@ -10,7 +10,8 @@ SOURCES = logfilepositionsource.cpp \
 CONFIG += console
 
 include(../examples.pri)
-qtAddLibrary(QtLocation)
+CONFIG += mobility
+MOBILITY = location
 
 logfileexample.path = $$DESTDIR
 logfileexample.files = simplelog.txt
diff --git a/examples/player/player.pro b/examples/player/player.pro
index 980e7ab579..dd55c07bad 100644
--- a/examples/player/player.pro
+++ b/examples/player/player.pro
@@ -4,7 +4,8 @@ TARGET = player
 INCLUDEPATH += ../../src/multimedia
 
 include(../examples.pri)
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
 HEADERS = \
     player.h \
diff --git a/examples/publish-subscribe/publish-subscribe.pro b/examples/publish-subscribe/publish-subscribe.pro
index 7c53aa906d..1a892fdcb2 100644
--- a/examples/publish-subscribe/publish-subscribe.pro
+++ b/examples/publish-subscribe/publish-subscribe.pro
@@ -15,4 +15,6 @@ FORMS = providerdialog.ui \
         consumerdialog.ui
 
 include(../examples.pri)
-qtAddLibrary(QtPublishSubscribe)
+
+CONFIG += mobility
+MOBILITY = publishsubscribe
diff --git a/examples/querymessages/querymessages.pro b/examples/querymessages/querymessages.pro
index 8d08b22c99..cab96e6829 100644
--- a/examples/querymessages/querymessages.pro
+++ b/examples/querymessages/querymessages.pro
@@ -5,7 +5,8 @@ QT += gui
 
 include(../examples.pri)
 
-qtAddLibrary(QtMessaging)
+CONFIG += mobility
+MOBILITY = messaging
 INCLUDEPATH += ../../src/messaging
 
 symbian|win32 {
diff --git a/examples/samplephonebook/samplephonebook.pro b/examples/samplephonebook/samplephonebook.pro
index 0906f2d64a..cbed882587 100644
--- a/examples/samplephonebook/samplephonebook.pro
+++ b/examples/samplephonebook/samplephonebook.pro
@@ -17,7 +17,8 @@ INCLUDEPATH += ../testmodel
 VPATH += ../testmodel
 
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 
 # Input
 SOURCES =  contactdetailsform.cpp \
@@ -53,4 +54,3 @@ symbian: {
                         SwEvent
 }
 include(../examples.pri)
-qtAddLibrary(QtContacts)
diff --git a/examples/sendmessage/sendmessage.pro b/examples/sendmessage/sendmessage.pro
index cf7c496083..9c962e3694 100644
--- a/examples/sendmessage/sendmessage.pro
+++ b/examples/sendmessage/sendmessage.pro
@@ -5,7 +5,8 @@ QT += gui
 
 include(../examples.pri)
 
-qtAddLibrary(QtMessaging)
+CONFIG += mobility
+MOBILITY = messaging
 INCLUDEPATH += ../../src/messaging
 
 symbian|win32 {
diff --git a/examples/serviceactions/serviceactions.pro b/examples/serviceactions/serviceactions.pro
index d2c6c4418d..4cb1f53e98 100644
--- a/examples/serviceactions/serviceactions.pro
+++ b/examples/serviceactions/serviceactions.pro
@@ -5,7 +5,8 @@ QT += gui
 
 include(../examples.pri)
 
-qtAddLibrary(QtMessaging)
+CONFIG += mobility
+MOBILITY = messaging
 INCLUDEPATH += ../../src/messaging
 
 symbian|win32 {
diff --git a/examples/servicebrowser/servicebrowser.pro b/examples/servicebrowser/servicebrowser.pro
index ddf8bf6006..5b06a1f092 100644
--- a/examples/servicebrowser/servicebrowser.pro
+++ b/examples/servicebrowser/servicebrowser.pro
@@ -11,7 +11,8 @@ HEADERS += servicebrowser.h
 SOURCES += servicebrowser.cpp \
            main.cpp
 
-qtAddLibrary(QtServiceFramework)
+CONFIG += mobility
+MOBILITY = serviceframework
 
 symbian {
     addFiles.sources = ../filemanagerplugin/filemanagerservice.xml
diff --git a/examples/slideshow/slideshow.pro b/examples/slideshow/slideshow.pro
index a41c1f6895..92d9b79695 100644
--- a/examples/slideshow/slideshow.pro
+++ b/examples/slideshow/slideshow.pro
@@ -3,7 +3,8 @@ TARGET = slideshow
 INCLUDEPATH+=../../src/multimedia
 include (../examples.pri)
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
 HEADERS = \
     slideshow.h
diff --git a/examples/streamplayer/streamplayer.pro b/examples/streamplayer/streamplayer.pro
index 7dd76213a2..4f60d6cf0b 100644
--- a/examples/streamplayer/streamplayer.pro
+++ b/examples/streamplayer/streamplayer.pro
@@ -4,7 +4,8 @@ TARGET=streamplayer
 INCLUDEPATH+=../../src/multimedia
 include (../examples.pri)
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
 HEADERS = \
     streamplayer.h
diff --git a/examples/sysinfo/sysinfo.pro b/examples/sysinfo/sysinfo.pro
index 756148f66d..c2aeee8942 100644
--- a/examples/sysinfo/sysinfo.pro
+++ b/examples/sysinfo/sysinfo.pro
@@ -12,7 +12,8 @@ HEADERS  += dialog.h
 INCLUDEPATH += ../../src/systeminfo
 
 include(../examples.pri)
-qtAddLibrary(QtSystemInfo)
+CONFIG += mobility
+MOBILITY = systeminfo
 
 CONFIG += console
 
diff --git a/features/deploy.pri b/features/deploy.pri
index c2d1813541..e6efdb495d 100644
--- a/features/deploy.pri
+++ b/features/deploy.pri
@@ -3,7 +3,7 @@ headers.path = $$QT_MOBILITY_INCLUDE
 
 contains(TEMPLATE,.*lib) {
     target.path=$$QT_MOBILITY_LIB
-    TARGET = $$qtLibraryTarget($$TARGET)
+    TARGET = $$qtLibraryTarget($${TARGET}_beta)
 } else {
     contains(TEMPLATE,.*app):target.path=$$QT_MOBILITY_BIN
 }
diff --git a/features/mobility.prf.template b/features/mobility.prf.template
index d149cd7143..f691b8fdd5 100644
--- a/features/mobility.prf.template
+++ b/features/mobility.prf.template
@@ -3,33 +3,33 @@ mac: LIBS += -F$${MOBILITY_LIB}
 LIBS+= -L$${MOBILITY_LIB}
 
 contains(MOBILITY, bearer) {
-    qtAddLibrary(QtBearer)
+    qtAddLibrary(QtBearer_beta)
 }
 
 contains(MOBILITY, publishsubscribe) {
-    qtAddLibrary(QtPublishSubscribe)
+    qtAddLibrary(QtPublishSubscribe_beta)
 }
 
 contains(MOBILITY, location) {
-    qtAddLibrary(QtLocation)
+    qtAddLibrary(QtLocation_beta)
 }
 
 contains(MOBILITY, serviceframework) {
-    qtAddLibrary(QtServiceFramework)
+    qtAddLibrary(QtServiceFramework_beta)
 }
 
 contains(MOBILITY, systeminfo) {
-    qtAddLibrary(QtSystemInfo)
+    qtAddLibrary(QtSystemInfo_beta)
 }
 
 contains(MOBILITY, multimedia) {
-    qtAddLibrary(QtMedia)
+    qtAddLibrary(QtMedia_beta)
 }
 
 contains(MOBILITY, contacts) {
-    qtAddLibrary(QtContacts)
+    qtAddLibrary(QtContacts_beta)
 }
 
 contains(MOBILITY, messaging) {
-    qtAddLibrary(QtMessaging)
+    qtAddLibrary(QtMessaging_beta)
 }
diff --git a/plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro b/plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro
index 13db6b6d7c..c65c1f1c10 100644
--- a/plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro
+++ b/plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro
@@ -16,7 +16,8 @@ MOC_DIR = .moc/
 OBJECTS_DIR = .obj/
 
 LIBS += -lqttracker
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 
 target.path = $$SOURCE_DIR/plugins/contacts
 INSTALLS += target
diff --git a/plugins/contacts/symbian/symbian.pro b/plugins/contacts/symbian/symbian.pro
index 1c6a67d949..447ba63a48 100644
--- a/plugins/contacts/symbian/symbian.pro
+++ b/plugins/contacts/symbian/symbian.pro
@@ -91,7 +91,8 @@ symbian: {
         src/cntsymbiantransformerror.cpp \
         src/cntsymbiandatabase.cpp
       
-    qtAddLibrary(QtContacts)
+    CONFIG += mobility
+    MOBILITY = contacts
 
     LIBS += \
         -lcntmodel \
diff --git a/plugins/contacts/wince/wince.pro b/plugins/contacts/wince/wince.pro
index b072be2426..b0a20de68b 100644
--- a/plugins/contacts/wince/wince.pro
+++ b/plugins/contacts/wince/wince.pro
@@ -19,5 +19,6 @@ INCLUDEPATH += $$SOURCE_DIR/src/contacts $$SOURCE_DIR/src/contacts/details $$SOU
 target.path=$$QT_MOBILITY_PREFIX/plugins/contacts
 INSTALLS+=target
 LIBS += pimstore.lib -lole32
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 
diff --git a/plugins/multimedia/audiocapture/audiocapture.pro b/plugins/multimedia/audiocapture/audiocapture.pro
index b657d3f7be..d4bb450934 100644
--- a/plugins/multimedia/audiocapture/audiocapture.pro
+++ b/plugins/multimedia/audiocapture/audiocapture.pro
@@ -8,7 +8,8 @@ QT += multimedia
 include (../../../common.pri)
 INCLUDEPATH += ../../../src/multimedia
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
 DEPENDPATH += .
 
diff --git a/plugins/multimedia/directshow/directshow.pro b/plugins/multimedia/directshow/directshow.pro
index 8fe601c65a..518f2475fe 100644
--- a/plugins/multimedia/directshow/directshow.pro
+++ b/plugins/multimedia/directshow/directshow.pro
@@ -9,7 +9,8 @@ PLUGIN_TYPE = mediaservice
 include (../../../common.pri)
 INCLUDEPATH+=../../../src/multimedia
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
 DEPENDPATH += .
 
diff --git a/plugins/multimedia/gstreamer/gstreamer.pro b/plugins/multimedia/gstreamer/gstreamer.pro
index d95a9aec5e..ab36b8fe53 100644
--- a/plugins/multimedia/gstreamer/gstreamer.pro
+++ b/plugins/multimedia/gstreamer/gstreamer.pro
@@ -6,7 +6,8 @@ PLUGIN_TYPE=mediaservice
 include(../../../common.pri)
 INCLUDEPATH+=../../../src/multimedia
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
 DEPENDPATH += .
 
diff --git a/plugins/multimedia/m3u/m3u.pro b/plugins/multimedia/m3u/m3u.pro
index 3a3bec0894..d24fbea655 100644
--- a/plugins/multimedia/m3u/m3u.pro
+++ b/plugins/multimedia/m3u/m3u.pro
@@ -6,7 +6,8 @@ PLUGIN_TYPE = playlistformats
 
 include (../../../common.pri)
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
 DEPENDPATH += .
 INCLUDEPATH += . \
diff --git a/plugins/multimedia/phonon/phonon.pro b/plugins/multimedia/phonon/phonon.pro
index 3260335bcd..aee2c16bd9 100644
--- a/plugins/multimedia/phonon/phonon.pro
+++ b/plugins/multimedia/phonon/phonon.pro
@@ -7,7 +7,8 @@ PLUGIN_TYPE = mediaservice
 
 include (../../../common.pri)
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
 INCLUDEPATH += ../../../src/multimedia
 
diff --git a/plugins/multimedia/v4l/v4l.pro b/plugins/multimedia/v4l/v4l.pro
index 665ec1f71f..17a7fa0f44 100644
--- a/plugins/multimedia/v4l/v4l.pro
+++ b/plugins/multimedia/v4l/v4l.pro
@@ -6,7 +6,8 @@ PLUGIN_TYPE = mediaservice
 
 include (../../../common.pri)
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
 DEPENDPATH += .
 
diff --git a/plugins/multimedia/wmp/wmp.pro b/plugins/multimedia/wmp/wmp.pro
index 544d55c3d2..55f918e9ed 100644
--- a/plugins/multimedia/wmp/wmp.pro
+++ b/plugins/multimedia/wmp/wmp.pro
@@ -11,7 +11,8 @@ TMP_INCLUDE = $$quote($$(INCLUDE))
 TMP_SEARCHPATHS = $$split(TMP_INCLUDE, ";") $$QMAKE_INCDIR
 for(p, TMP_SEARCHPATHS): exists($${p}/evr.h): DEFINES *= QWMP_EVR
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 LIBS += -lstrmiids -lole32 -lOleaut32 -luser32 -lgdi32
 
 HEADERS = \
diff --git a/tests/auto/contacts_plugins.pri b/tests/auto/contacts_plugins.pri
index 979ff52bac..3ca596ab35 100644
--- a/tests/auto/contacts_plugins.pri
+++ b/tests/auto/contacts_plugins.pri
@@ -31,6 +31,7 @@ wince* {
 }
 
 # Add this too
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 
 
diff --git a/tests/auto/databasemanager/databasemanager.pro b/tests/auto/databasemanager/databasemanager.pro
index fc7dab4597..a827030e55 100644
--- a/tests/auto/databasemanager/databasemanager.pro
+++ b/tests/auto/databasemanager/databasemanager.pro
@@ -50,4 +50,5 @@ symbian {
                     tst_databasemanager.cpp
 }
 
-qtAddLibrary(QtServiceFramework)
+CONFIG += mobility
+MOBILITY = serviceframework
diff --git a/tests/auto/qabstractsecuritysession/qabstractsecuritysession.pro b/tests/auto/qabstractsecuritysession/qabstractsecuritysession.pro
index 6a319f2092..cb60613217 100644
--- a/tests/auto/qabstractsecuritysession/qabstractsecuritysession.pro
+++ b/tests/auto/qabstractsecuritysession/qabstractsecuritysession.pro
@@ -11,7 +11,8 @@ HEADERS += ../qsfwtestutil.h
 SOURCES += tst_qabstractsecuritysession.cpp \
            ../qsfwtestutil.cpp
 
-qtAddLibrary(QtServiceFramework)
+CONFIG += mobility
+MOBILITY = serviceframework
 
 symbian|wince* {
     
diff --git a/tests/auto/qaudiocapturesource/qaudiocapturesource.pro b/tests/auto/qaudiocapturesource/qaudiocapturesource.pro
index 4d4a379e46..c4363a7881 100644
--- a/tests/auto/qaudiocapturesource/qaudiocapturesource.pro
+++ b/tests/auto/qaudiocapturesource/qaudiocapturesource.pro
@@ -7,5 +7,6 @@ SOURCES += tst_qaudiocapturesource.cpp
 
 include (../../../common.pri)
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
diff --git a/tests/auto/qcamera/qcamera.pro b/tests/auto/qcamera/qcamera.pro
index 7623925c9a..b7023b27e8 100644
--- a/tests/auto/qcamera/qcamera.pro
+++ b/tests/auto/qcamera/qcamera.pro
@@ -6,5 +6,6 @@ SOURCES += tst_qcamera.cpp
 
 include (../../../common.pri)
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
diff --git a/tests/auto/qcontact/qcontact.pro b/tests/auto/qcontact/qcontact.pro
index 337f7bf690..82cb029030 100644
--- a/tests/auto/qcontact/qcontact.pro
+++ b/tests/auto/qcontact/qcontact.pro
@@ -12,7 +12,8 @@ INCLUDEPATH += ../../../src/contacts \
 
 INCLUDEPATH += ../
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 
 SOURCES  += tst_qcontact.cpp
 
diff --git a/tests/auto/qcontactactions/sendemailaction/sendemailaction.pro b/tests/auto/qcontactactions/sendemailaction/sendemailaction.pro
index ad8a1a35c0..b6b7578fdd 100644
--- a/tests/auto/qcontactactions/sendemailaction/sendemailaction.pro
+++ b/tests/auto/qcontactactions/sendemailaction/sendemailaction.pro
@@ -12,7 +12,8 @@ INCLUDEPATH += ../../../../src/contacts \
 
 INCLUDEPATH += ../../
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 
 DEFINES += ACTIONFACTORYPLUGINTARGET=contacts_sendemailactionfactory
 DEFINES += ACTIONFACTORYPLUGINNAME=SendEmailActionFactory
diff --git a/tests/auto/qcontactactions/unittest/unittest.pro b/tests/auto/qcontactactions/unittest/unittest.pro
index 53a0c6acba..84c370ef15 100644
--- a/tests/auto/qcontactactions/unittest/unittest.pro
+++ b/tests/auto/qcontactactions/unittest/unittest.pro
@@ -14,7 +14,8 @@ INCLUDEPATH += ../../../../src/contacts \
 
 INCLUDEPATH += ../../
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 SOURCES  += tst_qcontactactions.cpp
 
 # App local deployment
diff --git a/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.pro b/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.pro
index a08f9e2afa..8f33364c3f 100644
--- a/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.pro
+++ b/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.pro
@@ -12,7 +12,8 @@ INCLUDEPATH += ../../../../src/contacts \
 
 INCLUDEPATH += ../../
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 
 DEFINES += MALICIOUSPLUGINTARGET=contacts_maliciousplugin
 DEFINES += MALICIOUSPLUGINNAME=maliciousplugin
diff --git a/tests/auto/qcontactasync/unittest/unittest.pro b/tests/auto/qcontactasync/unittest/unittest.pro
index 74fa94fb70..73889d98ee 100644
--- a/tests/auto/qcontactasync/unittest/unittest.pro
+++ b/tests/auto/qcontactasync/unittest/unittest.pro
@@ -14,7 +14,8 @@ INCLUDEPATH += ../../../../src/contacts \
 
 INCLUDEPATH += ../../
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 
 SOURCES  += tst_qcontactasync.cpp
 
diff --git a/tests/auto/qcontactdetail/qcontactdetail.pro b/tests/auto/qcontactdetail/qcontactdetail.pro
index 495b07aa69..625ddd287f 100644
--- a/tests/auto/qcontactdetail/qcontactdetail.pro
+++ b/tests/auto/qcontactdetail/qcontactdetail.pro
@@ -11,7 +11,8 @@ INCLUDEPATH += ../../../src/contacts \
                ../../../src/contacts/filters
 INCLUDEPATH += ../
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 SOURCES  += tst_qcontactdetail.cpp
 
 symbian: {
diff --git a/tests/auto/qcontactdetaildefinition/qcontactdetaildefinition.pro b/tests/auto/qcontactdetaildefinition/qcontactdetaildefinition.pro
index 73fe8af184..42f7b00ef9 100644
--- a/tests/auto/qcontactdetaildefinition/qcontactdetaildefinition.pro
+++ b/tests/auto/qcontactdetaildefinition/qcontactdetaildefinition.pro
@@ -11,7 +11,8 @@ INCLUDEPATH += ../../../src/contacts \
                ../../../src/contacts/filters
 INCLUDEPATH += ../
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 SOURCES  += tst_qcontactdetaildefinition.cpp
 
 symbian: {
diff --git a/tests/auto/qcontactdetails/qcontactdetails.pro b/tests/auto/qcontactdetails/qcontactdetails.pro
index 214c4ac5e5..776954349e 100644
--- a/tests/auto/qcontactdetails/qcontactdetails.pro
+++ b/tests/auto/qcontactdetails/qcontactdetails.pro
@@ -11,7 +11,8 @@ INCLUDEPATH += ../../../src/contacts \
                ../../../src/contacts/filters
 INCLUDEPATH += ../
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 SOURCES  += tst_qcontactdetails.cpp
 
 symbian: {
diff --git a/tests/auto/qcontactfilter/qcontactfilter.pro b/tests/auto/qcontactfilter/qcontactfilter.pro
index fbe1c4253c..1d544d8918 100644
--- a/tests/auto/qcontactfilter/qcontactfilter.pro
+++ b/tests/auto/qcontactfilter/qcontactfilter.pro
@@ -11,7 +11,8 @@ INCLUDEPATH += ../../../src/contacts \
                ../../../src/contacts/filters
 INCLUDEPATH += ../
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 
 SOURCES  += tst_qcontactfilter.cpp
 
diff --git a/tests/auto/qcontactmanager/qcontactmanager.pro b/tests/auto/qcontactmanager/qcontactmanager.pro
index ed30d1c20a..04df5e5b52 100644
--- a/tests/auto/qcontactmanager/qcontactmanager.pro
+++ b/tests/auto/qcontactmanager/qcontactmanager.pro
@@ -11,7 +11,8 @@ INCLUDEPATH += ../../../src/contacts \
                ../../../src/contacts/filters
 INCLUDEPATH += ../
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 SOURCES  += tst_qcontactmanager.cpp
 
 symbian: {
diff --git a/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro b/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro
index bb421d72d9..735e632879 100644
--- a/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro
+++ b/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro
@@ -11,7 +11,8 @@ INCLUDEPATH += ../../../src/contacts \
                ../../../src/contacts/filters
 INCLUDEPATH += ../
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 SOURCES  += tst_qcontactmanagerfiltering.cpp
 
 symbian: {
diff --git a/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.pro b/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.pro
index c09b77344f..df2793ae5a 100644
--- a/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.pro
+++ b/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.pro
@@ -10,7 +10,8 @@ INCLUDEPATH += ../../../../src/contacts \
                ../../../../src/contacts/requests \
                ../../../../src/contacts/filters
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 SOURCES += dummyplugin.cpp
 
 DEFINES += DUMMYPLUGINNAME=testdummy
diff --git a/tests/auto/qcontactmanagerplugins/dummyplugincopy/dummyplugincopy.pro b/tests/auto/qcontactmanagerplugins/dummyplugincopy/dummyplugincopy.pro
index 6fd8f8b3b9..931ccdc7b0 100644
--- a/tests/auto/qcontactmanagerplugins/dummyplugincopy/dummyplugincopy.pro
+++ b/tests/auto/qcontactmanagerplugins/dummyplugincopy/dummyplugincopy.pro
@@ -10,7 +10,8 @@ INCLUDEPATH += ../../../../src/contacts \
                ../../../../src/contacts/requests \
                ../../../../src/contacts/filters
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 
 DEFINES += DUMMYPLUGINTARGET=contacts_testdummycopy
 DEFINES += DUMMYPLUGINNAME=testdummy
diff --git a/tests/auto/qcontactmanagerplugins/dummypluginempty/dummypluginempty.pro b/tests/auto/qcontactmanagerplugins/dummypluginempty/dummypluginempty.pro
index 17f78b3ee5..858eef9788 100644
--- a/tests/auto/qcontactmanagerplugins/dummypluginempty/dummypluginempty.pro
+++ b/tests/auto/qcontactmanagerplugins/dummypluginempty/dummypluginempty.pro
@@ -10,7 +10,8 @@ INCLUDEPATH += ../../../../src/contacts \
                ../../../../src/contacts/requests \
                ../../../../src/contacts/filters
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 
 DEFINES += DUMMYPLUGINTARGET=contacts_testdummyempty
 
diff --git a/tests/auto/qcontactmanagerplugins/dummyplugininvalid/dummyplugininvalid.pro b/tests/auto/qcontactmanagerplugins/dummyplugininvalid/dummyplugininvalid.pro
index c4115f0fb4..43c9cad055 100644
--- a/tests/auto/qcontactmanagerplugins/dummyplugininvalid/dummyplugininvalid.pro
+++ b/tests/auto/qcontactmanagerplugins/dummyplugininvalid/dummyplugininvalid.pro
@@ -10,7 +10,8 @@ INCLUDEPATH += ../../../../src/contacts \
                ../../../../src/contacts/requests \
                ../../../../src/contacts/filters
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 DEFINES += DUMMYPLUGINTARGET=contacts_testdummyinvalid
 DEFINES += DUMMYPLUGINNAME=invalid
 
diff --git a/tests/auto/qcontactmanagerplugins/dummypluginmemory/dummypluginmemory.pro b/tests/auto/qcontactmanagerplugins/dummypluginmemory/dummypluginmemory.pro
index 1d8b779364..5212268529 100644
--- a/tests/auto/qcontactmanagerplugins/dummypluginmemory/dummypluginmemory.pro
+++ b/tests/auto/qcontactmanagerplugins/dummypluginmemory/dummypluginmemory.pro
@@ -8,7 +8,8 @@ INCLUDEPATH += ../../../../src/contacts \
                ../../../../src/contacts/requests \
                ../../../../src/contacts/filters
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 
 include(../../../../common.pri)
 
diff --git a/tests/auto/qcontactmanagerplugins/unittest/unittest.pro b/tests/auto/qcontactmanagerplugins/unittest/unittest.pro
index f7bcf6afc7..96f645f709 100644
--- a/tests/auto/qcontactmanagerplugins/unittest/unittest.pro
+++ b/tests/auto/qcontactmanagerplugins/unittest/unittest.pro
@@ -12,11 +12,10 @@ INCLUDEPATH += ../../../../src/contacts \
 
 INCLUDEPATH += ../../
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 SOURCES  += tst_qcontactmanagerplugins.cpp
 
-qtAddLibrary(QtContacts)
-
 TESTDLLS = \
     $$mobilityDeployFilename(contacts_testdummy) \
     $$mobilityDeployFilename(contacts_testotherdummy) \
diff --git a/tests/auto/qcontactrelationship/qcontactrelationship.pro b/tests/auto/qcontactrelationship/qcontactrelationship.pro
index 5f51daa837..b2115df435 100644
--- a/tests/auto/qcontactrelationship/qcontactrelationship.pro
+++ b/tests/auto/qcontactrelationship/qcontactrelationship.pro
@@ -14,7 +14,8 @@ INCLUDEPATH += ../
 
 SOURCES  += tst_qcontactrelationship.cpp
 
-qtAddLibrary(QtContacts)
+CONFIG += mobility
+MOBILITY = contacts
 
 # App local deployment
 symbian:QCONTACTACTION_PLUGINS_DEPLOY.sources = contacts_sendemailactionfactory.dll
diff --git a/tests/auto/qgeoareamonitor/qgeoareamonitor.pro b/tests/auto/qgeoareamonitor/qgeoareamonitor.pro
index 0acd041dd9..4b4418b72e 100644
--- a/tests/auto/qgeoareamonitor/qgeoareamonitor.pro
+++ b/tests/auto/qgeoareamonitor/qgeoareamonitor.pro
@@ -11,7 +11,8 @@ HEADERS += ../qlocationtestutils_p.h
 SOURCES += tst_qgeoareamonitor.cpp \
            ../qlocationtestutils.cpp
 
-qtAddLibrary(QtLocation)
+CONFIG += mobility
+MOBILITY = location
 
 symbian {
         TARGET.CAPABILITY = ALL -TCB
diff --git a/tests/auto/qgeocoordinate/qgeocoordinate.pro b/tests/auto/qgeocoordinate/qgeocoordinate.pro
index 3136cf4986..a88ada5d5a 100644
--- a/tests/auto/qgeocoordinate/qgeocoordinate.pro
+++ b/tests/auto/qgeocoordinate/qgeocoordinate.pro
@@ -11,7 +11,8 @@ HEADERS += ../qlocationtestutils_p.h
 SOURCES += tst_qgeocoordinate.cpp \
            ../qlocationtestutils.cpp
 
-qtAddLibrary(QtLocation)
+CONFIG += mobility
+MOBILITY = location
 
 symbian {
     INCLUDEPATH += $${EPOCROOT}/epoc32/include/osextensions
diff --git a/tests/auto/qgeoinfosources_wince/qgeoinfosources_wince.pro b/tests/auto/qgeoinfosources_wince/qgeoinfosources_wince.pro
index 1ea2801bf8..59fea8b00e 100644
--- a/tests/auto/qgeoinfosources_wince/qgeoinfosources_wince.pro
+++ b/tests/auto/qgeoinfosources_wince/qgeoinfosources_wince.pro
@@ -12,5 +12,6 @@ HEADERS += ../qlocationtestutils_p.h
 SOURCES += ../qlocationtestutils.cpp \
            tst_qgeoinfosources_wince.cpp
 
-qtAddLibrary(QtLocation)
+CONFIG += mobility
+MOBILITY = location
 
diff --git a/tests/auto/qgeopositioninfo/qgeopositioninfo.pro b/tests/auto/qgeopositioninfo/qgeopositioninfo.pro
index cfd695e675..5500e84428 100644
--- a/tests/auto/qgeopositioninfo/qgeopositioninfo.pro
+++ b/tests/auto/qgeopositioninfo/qgeopositioninfo.pro
@@ -9,7 +9,8 @@ INCLUDEPATH += ../../../src/location
 # Input 
 SOURCES += tst_qgeopositioninfo.cpp
 
-qtAddLibrary(QtLocation)
+CONFIG += mobility
+MOBILITY = location
 
 symbian {
         TARGET.CAPABILITY = ALL -TCB
diff --git a/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro b/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro
index 8d5fc92ec5..26e6c4060d 100644
--- a/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro
+++ b/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro
@@ -14,7 +14,8 @@ SOURCES += ../qlocationtestutils.cpp \
            ../testqgeopositioninfosource.cpp \
            tst_qgeopositioninfosource.cpp
 
-qtAddLibrary(QtLocation)
+CONFIG += mobility
+MOBILITY = location
 
 symbian {
         TARGET.CAPABILITY = ALL -TCB
diff --git a/tests/auto/qgeosatelliteinfo/qgeosatelliteinfo.pro b/tests/auto/qgeosatelliteinfo/qgeosatelliteinfo.pro
index 8cf1cf4e82..c6155ea42a 100644
--- a/tests/auto/qgeosatelliteinfo/qgeosatelliteinfo.pro
+++ b/tests/auto/qgeosatelliteinfo/qgeosatelliteinfo.pro
@@ -9,7 +9,8 @@ INCLUDEPATH += ../../../src/location
 # Input 
 SOURCES += tst_qgeosatelliteinfo.cpp
 
-qtAddLibrary(QtLocation)
+CONFIG += mobility
+MOBILITY = location
 
 symbian {
         TARGET.CAPABILITY = ALL -TCB
diff --git a/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro b/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro
index 9c96f4b8a4..b10f85f9d6 100644
--- a/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro
+++ b/tests/auto/qgeosatelliteinfosource/qgeosatelliteinfosource.pro
@@ -13,7 +13,8 @@ SOURCES += tst_qgeosatelliteinfosource.cpp \
 HEADERS += ../testqgeosatelliteinfosource_p.h \
         ../qlocationtestutils_p.h
 
-qtAddLibrary(QtLocation)
+CONFIG += mobility
+MOBILITY = location
 
 symbian {
         TARGET.CAPABILITY = ALL -TCB
diff --git a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
index 9798933a2a..802500a2fc 100644
--- a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
+++ b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
@@ -8,5 +8,6 @@ SOURCES += tst_qgraphicsvideoitem.cpp
 
 include (../../../common.pri)
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
diff --git a/tests/auto/qlocationutils/qlocationutils.pro b/tests/auto/qlocationutils/qlocationutils.pro
index d6ea5219f5..b49d8f1ffc 100644
--- a/tests/auto/qlocationutils/qlocationutils.pro
+++ b/tests/auto/qlocationutils/qlocationutils.pro
@@ -9,7 +9,8 @@ INCLUDEPATH += ../../../src/location
 # Input 
 SOURCES += tst_qlocationutils.cpp
 
-qtAddLibrary(QtLocation)
+CONFIG += mobility
+MOBILITY = location
 
 symbian {
         TARGET.CAPABILITY = ALL -TCB
diff --git a/tests/auto/qmallocpool/qmallocpool.pro b/tests/auto/qmallocpool/qmallocpool.pro
index 9984cc4a93..c50911428d 100644
--- a/tests/auto/qmallocpool/qmallocpool.pro
+++ b/tests/auto/qmallocpool/qmallocpool.pro
@@ -8,6 +8,8 @@ include(../../../common.pri)
 # Input
 SOURCES += tst_qmallocpool.cpp
 
-qtAddLibrary(QtPublishSubscribe)
+CONFIG += mobility
+MOBILITY = publishsubscribe
+
 symbian:TARGET.CAPABILITY = ALL \
     -TCB
diff --git a/tests/auto/qmediacontent/qmediacontent.pro b/tests/auto/qmediacontent/qmediacontent.pro
index e797189f45..71730dc3a8 100644
--- a/tests/auto/qmediacontent/qmediacontent.pro
+++ b/tests/auto/qmediacontent/qmediacontent.pro
@@ -4,5 +4,6 @@ CONFIG += testcase
 
 include (../../../common.pri)
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 SOURCES += tst_qmediacontent.cpp
diff --git a/tests/auto/qmediaimageviewer/qmediaimageviewer.pro b/tests/auto/qmediaimageviewer/qmediaimageviewer.pro
index acd8e9c20a..0ee874eb15 100644
--- a/tests/auto/qmediaimageviewer/qmediaimageviewer.pro
+++ b/tests/auto/qmediaimageviewer/qmediaimageviewer.pro
@@ -7,7 +7,8 @@ include (../../../common.pri)
 SOURCES += tst_qmediaimageviewer.cpp
 
 QT += network multimedia
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
 !contains(QT_CONFIG, no-jpeg):DEFINES += QTEST_HAVE_JPEG
 
diff --git a/tests/auto/qmediaobject/qmediaobject.pro b/tests/auto/qmediaobject/qmediaobject.pro
index e298e591c7..d8b5e0f475 100644
--- a/tests/auto/qmediaobject/qmediaobject.pro
+++ b/tests/auto/qmediaobject/qmediaobject.pro
@@ -6,4 +6,5 @@ include (../../../common.pri)
 
 SOURCES += tst_qmediaobject.cpp
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
diff --git a/tests/auto/qmediaplayer/qmediaplayer.pro b/tests/auto/qmediaplayer/qmediaplayer.pro
index a07ead1b61..9dba08528f 100644
--- a/tests/auto/qmediaplayer/qmediaplayer.pro
+++ b/tests/auto/qmediaplayer/qmediaplayer.pro
@@ -6,5 +6,6 @@ SOURCES += tst_qmediaplayer.cpp
 
 include (../../../common.pri)
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
diff --git a/tests/auto/qmediaplaylist/qmediaplaylist.pro b/tests/auto/qmediaplaylist/qmediaplaylist.pro
index f066e099b9..a002b14629 100644
--- a/tests/auto/qmediaplaylist/qmediaplaylist.pro
+++ b/tests/auto/qmediaplaylist/qmediaplaylist.pro
@@ -13,5 +13,6 @@ SOURCES += \
 
 INCLUDEPATH += $$QT_MOBILITY_SOURCE_TREE/plugins/multimedia/m3u
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
diff --git a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro b/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
index 0fb32ec67c..d17657b01e 100644
--- a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
+++ b/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
@@ -6,5 +6,6 @@ SOURCES += tst_qmediaplaylistnavigator.cpp
 
 include (../../../common.pri)
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
diff --git a/tests/auto/qmediapluginloader/qmediapluginloader.pro b/tests/auto/qmediapluginloader/qmediapluginloader.pro
index b6a8064fd1..5c249b8f8e 100644
--- a/tests/auto/qmediapluginloader/qmediapluginloader.pro
+++ b/tests/auto/qmediapluginloader/qmediapluginloader.pro
@@ -6,7 +6,8 @@ SOURCES += tst_qmediapluginloader.cpp
 
 include (../../../common.pri)
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
 wince* {
     PLUGIN_DEPLOY.sources = $$OUTPUT_DIR/plugins/mediaservice/*.dll
diff --git a/tests/auto/qmediarecorder/qmediarecorder.pro b/tests/auto/qmediarecorder/qmediarecorder.pro
index 9b6a8e21dd..1f38c70a89 100644
--- a/tests/auto/qmediarecorder/qmediarecorder.pro
+++ b/tests/auto/qmediarecorder/qmediarecorder.pro
@@ -6,5 +6,6 @@ SOURCES += tst_qmediarecorder.cpp
 
 include (../../../common.pri)
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
diff --git a/tests/auto/qmediaresource/qmediaresource.pro b/tests/auto/qmediaresource/qmediaresource.pro
index d8f5fd4c1c..1fb82f22a0 100644
--- a/tests/auto/qmediaresource/qmediaresource.pro
+++ b/tests/auto/qmediaresource/qmediaresource.pro
@@ -6,5 +6,6 @@ include (../../../common.pri)
 
 SOURCES += tst_qmediaresource.cpp
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
diff --git a/tests/auto/qmediaservice/qmediaservice.pro b/tests/auto/qmediaservice/qmediaservice.pro
index ab71a13d24..5aaf9236e2 100644
--- a/tests/auto/qmediaservice/qmediaservice.pro
+++ b/tests/auto/qmediaservice/qmediaservice.pro
@@ -6,5 +6,6 @@ include (../../../common.pri)
 
 SOURCES += tst_qmediaservice.cpp
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
diff --git a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro b/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro
index 01b1e477b1..ca86d26e71 100644
--- a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro
+++ b/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro
@@ -6,5 +6,6 @@ SOURCES += tst_qmediaserviceprovider.cpp
 
 include (../../../common.pri)
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
diff --git a/tests/auto/qmessage/qmessage.pro b/tests/auto/qmessage/qmessage.pro
index 208ad83543..715db570cf 100644
--- a/tests/auto/qmessage/qmessage.pro
+++ b/tests/auto/qmessage/qmessage.pro
@@ -7,7 +7,8 @@ QT += testlib
 include(../../../common.pri)
 include(../support/support.pri)
 
-qtAddLibrary(QtMessaging)
+CONFIG += mobility
+MOBILITY = messaging
 INCLUDEPATH += ../../../src/messaging
 
 symbian|wince*|maemo|win32 {
diff --git a/tests/auto/qmessagestore/qmessagestore.pro b/tests/auto/qmessagestore/qmessagestore.pro
index b9b4c0cbea..ae4391db18 100644
--- a/tests/auto/qmessagestore/qmessagestore.pro
+++ b/tests/auto/qmessagestore/qmessagestore.pro
@@ -7,7 +7,8 @@ QT += testlib
 include(../../../common.pri)
 include(../support/support.pri)
 
-qtAddLibrary(QtMessaging)
+CONFIG += mobility
+MOBILITY = messaging
 INCLUDEPATH += ../../../src/messaging
 
 symbian|wince*|maemo|win32 {
diff --git a/tests/auto/qmessagestorekeys/qmessagestorekeys.pro b/tests/auto/qmessagestorekeys/qmessagestorekeys.pro
index 8b8ed07c55..c2863584ee 100644
--- a/tests/auto/qmessagestorekeys/qmessagestorekeys.pro
+++ b/tests/auto/qmessagestorekeys/qmessagestorekeys.pro
@@ -7,7 +7,8 @@ QT += testlib
 include(../../../common.pri)
 include(../support/support.pri)
 
-qtAddLibrary(QtMessaging)
+CONFIG += mobility
+MOBILITY = messaging
 INCLUDEPATH += ../../../src/messaging
 
 symbian|win32 {
diff --git a/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro b/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro
index 0b2ed1a5cb..bdd4926c16 100644
--- a/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro
+++ b/tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro
@@ -8,7 +8,8 @@ QT = core network
 INCLUDEPATH += ../../../src/bearer
 
 include(../../../common.pri)
-qtAddLibrary(QtBearer)
+CONFIG += mobility
+MOBILITY = bearer
 
 symbian {
     TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData
diff --git a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro b/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro
index 61e4097e2c..c5a08b3fb3 100644
--- a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro
+++ b/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro
@@ -8,7 +8,8 @@ QT = core network
 INCLUDEPATH += ../../../src/bearer
 
 include(../../../common.pri)
-qtAddLibrary(QtBearer)
+CONFIG += mobility
+MOBILITY = bearer
 
 symbian {
     TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData 
diff --git a/tests/auto/qnetworksession/lackey/lackey.pro b/tests/auto/qnetworksession/lackey/lackey.pro
index 4cb8555c94..b8a006b38f 100644
--- a/tests/auto/qnetworksession/lackey/lackey.pro
+++ b/tests/auto/qnetworksession/lackey/lackey.pro
@@ -9,4 +9,5 @@ CONFIG+= testcase
 
 include(../../../../common.pri)
 
-qtAddLibrary(QtBearer)
+CONFIG += mobility
+MOBILITY = bearer
diff --git a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
index 1410601a89..ccc405eb5b 100644
--- a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
+++ b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
@@ -8,7 +8,8 @@ QT = core network
 INCLUDEPATH += ../../../../src/bearer
 
 include(../../../../common.pri)
-qtAddLibrary(QtBearer)
+CONFIG += mobility
+MOBILITY = bearer
 
 wince* {
     LACKEY.sources = $$OUTPUT_DIR/build/tests/bin/qnetworksessionlackey.exe
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource.pro
index 3573487691..9e1cad3074 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource.pro
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource.pro
@@ -16,7 +16,8 @@ SOURCES += ../qlocationtestutils.cpp \
            qnmeapositioninfosourceproxyfactory.cpp \
            tst_qnmeapositioninfosource.cpp
 
-qtAddLibrary(QtLocation)
+CONFIG += mobility
+MOBILITY = location
 
 symbian {
         TARGET.CAPABILITY = ALL -TCB
diff --git a/tests/auto/qpacket/qpacket.pro b/tests/auto/qpacket/qpacket.pro
index 7613030633..b9f5a3bebb 100644
--- a/tests/auto/qpacket/qpacket.pro
+++ b/tests/auto/qpacket/qpacket.pro
@@ -8,5 +8,6 @@ include(../../../common.pri)
 # Input
 SOURCES += tst_qpacket.cpp
 
-qtAddLibrary(QtPublishSubscribe)
+CONFIG += mobility
+MOBILITY = publishsubscribe
 symbian:TARGET.CAPABILITY = ALL -TCB
diff --git a/tests/auto/qpacketprotocol/qpacketprotocol.pro b/tests/auto/qpacketprotocol/qpacketprotocol.pro
index 4d3c761a07..42418b3b89 100644
--- a/tests/auto/qpacketprotocol/qpacketprotocol.pro
+++ b/tests/auto/qpacketprotocol/qpacketprotocol.pro
@@ -8,6 +8,7 @@ include(../../../common.pri)
 # Input
 SOURCES += tst_qpacketprotocol.cpp
 
-qtAddLibrary(QtPublishSubscribe)
+CONFIG += mobility
+MOBILITY = publishsubscribe
 symbian:TARGET.CAPABILITY = ALL \
     -TCB
diff --git a/tests/auto/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/qpaintervideosurface/qpaintervideosurface.pro
index 6ad2e15b96..edad5081bd 100644
--- a/tests/auto/qpaintervideosurface/qpaintervideosurface.pro
+++ b/tests/auto/qpaintervideosurface/qpaintervideosurface.pro
@@ -10,4 +10,5 @@ include (../../../common.pri)
 
 SOURCES += tst_qpaintervideosurface.cpp
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
diff --git a/tests/auto/qradiotuner/qradiotuner.pro b/tests/auto/qradiotuner/qradiotuner.pro
index c984d48885..b05cb5b221 100644
--- a/tests/auto/qradiotuner/qradiotuner.pro
+++ b/tests/auto/qradiotuner/qradiotuner.pro
@@ -7,5 +7,6 @@ SOURCES += tst_qradiotuner.cpp
 
 include (../../../common.pri)
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
 
diff --git a/tests/auto/qservicecontext/qservicecontext.pro b/tests/auto/qservicecontext/qservicecontext.pro
index 13ceece8e0..2a96c8a28e 100644
--- a/tests/auto/qservicecontext/qservicecontext.pro
+++ b/tests/auto/qservicecontext/qservicecontext.pro
@@ -11,7 +11,8 @@ include(../../../common.pri)
 HEADERS += 
 SOURCES += tst_qservicecontext.cpp 
 
-qtAddLibrary(QtServiceFramework)
+CONFIG += mobility
+MOBILITY = serviceframework
 
 symbian {
     TARGET.CAPABILITY = ALL -TCB
diff --git a/tests/auto/qservicefilter/qservicefilter.pro b/tests/auto/qservicefilter/qservicefilter.pro
index 170377fa97..33b9c4df90 100644
--- a/tests/auto/qservicefilter/qservicefilter.pro
+++ b/tests/auto/qservicefilter/qservicefilter.pro
@@ -8,7 +8,8 @@ QT = core
 
 include(../../../common.pri)
 
-qtAddLibrary(QtServiceFramework)
+CONFIG += mobility
+MOBILITY = serviceframework
 
 symbian {
     TARGET.CAPABILITY = ALL -TCB
diff --git a/tests/auto/qserviceinterfacedescriptor/qserviceinterfacedescriptor.pro b/tests/auto/qserviceinterfacedescriptor/qserviceinterfacedescriptor.pro
index f13894e228..c82b29308b 100644
--- a/tests/auto/qserviceinterfacedescriptor/qserviceinterfacedescriptor.pro
+++ b/tests/auto/qserviceinterfacedescriptor/qserviceinterfacedescriptor.pro
@@ -10,7 +10,8 @@ include(../../../common.pri)
 # Input 
 SOURCES += tst_qserviceinterfacedescriptor.cpp
 
-qtAddLibrary(QtServiceFramework)
+CONFIG += mobility
+MOBILITY = serviceframework
 
 symbian {
     TARGET.CAPABILITY = ALL -TCB
diff --git a/tests/auto/qsystemdeviceinfo/qsystemdeviceinfo.pro b/tests/auto/qsystemdeviceinfo/qsystemdeviceinfo.pro
index 79b2c1e5ee..6e77ae0af1 100644
--- a/tests/auto/qsystemdeviceinfo/qsystemdeviceinfo.pro
+++ b/tests/auto/qsystemdeviceinfo/qsystemdeviceinfo.pro
@@ -6,7 +6,8 @@ INCLUDEPATH += ../../../src/systeminfo
 SOURCES  += tst_qsystemdeviceinfo.cpp
 
 include(../../../common.pri)
-qtAddLibrary(QtSystemInfo)
+CONFIG += mobility
+MOBILITY = systeminfo
 
 symbian {
     TARGET.CAPABILITY = All -TCB -DRM
diff --git a/tests/auto/qsystemdisplayinfo/qsystemdisplayinfo.pro b/tests/auto/qsystemdisplayinfo/qsystemdisplayinfo.pro
index 835458f187..4ddf7bf11c 100644
--- a/tests/auto/qsystemdisplayinfo/qsystemdisplayinfo.pro
+++ b/tests/auto/qsystemdisplayinfo/qsystemdisplayinfo.pro
@@ -7,7 +7,8 @@ QT = core network gui
 INCLUDEPATH += ../../../src/systeminfo
 
 include(../../../common.pri)
-qtAddLibrary(QtSystemInfo)
+CONFIG += mobility
+MOBILITY = systeminfo
 
 symbian {
     TARGET.CAPABILITY = All -TCB -DRM
diff --git a/tests/auto/qsysteminfo/qsysteminfo.pro b/tests/auto/qsysteminfo/qsysteminfo.pro
index aff0fc4890..7b888068af 100644
--- a/tests/auto/qsysteminfo/qsysteminfo.pro
+++ b/tests/auto/qsysteminfo/qsysteminfo.pro
@@ -7,7 +7,8 @@ QT = core network
 INCLUDEPATH += ../../../src/systeminfo
 
 include(../../../common.pri)
-qtAddLibrary(QtSystemInfo)
+CONFIG += mobility
+MOBILITY = systeminfo
 
 symbian {
     TARGET.CAPABILITY = All -TCB -DRM
diff --git a/tests/auto/qsystemnetworkinfo/qsystemnetworkinfo.pro b/tests/auto/qsystemnetworkinfo/qsystemnetworkinfo.pro
index 78a2d08be6..ba5f297798 100644
--- a/tests/auto/qsystemnetworkinfo/qsystemnetworkinfo.pro
+++ b/tests/auto/qsystemnetworkinfo/qsystemnetworkinfo.pro
@@ -7,7 +7,8 @@ SOURCES  += tst_qsystemnetworkinfo.cpp
 INCLUDEPATH += ../../../src/systeminfo
 
 include(../../../common.pri)
-qtAddLibrary(QtSystemInfo)
+CONFIG += mobility
+MOBILITY = systeminfo
 
 symbian {
     TARGET.CAPABILITY = All -TCB -DRM
diff --git a/tests/auto/qsystemreadwritelock/test/test.pro b/tests/auto/qsystemreadwritelock/test/test.pro
index 9410fc5f5a..3598bf11db 100644
--- a/tests/auto/qsystemreadwritelock/test/test.pro
+++ b/tests/auto/qsystemreadwritelock/test/test.pro
@@ -11,7 +11,8 @@ include(../../../../common.pri)
 # Input 
 SOURCES += ../tst_qsystemreadwritelock.cpp
 
-qtAddLibrary(QtPublishSubscribe)
+CONFIG += mobility
+MOBILITY = publishsubscribe
 
 symbian {
     TARGET.CAPABILITY = ALL -TCB
diff --git a/tests/auto/qsystemreadwritelock_oop/lackey/lackey.pro b/tests/auto/qsystemreadwritelock_oop/lackey/lackey.pro
index d3b726b5df..d636991808 100644
--- a/tests/auto/qsystemreadwritelock_oop/lackey/lackey.pro
+++ b/tests/auto/qsystemreadwritelock_oop/lackey/lackey.pro
@@ -12,5 +12,6 @@ CONFIG+= testcase
 
 include(../../../../common.pri)
 
-qtAddLibrary(QtPublishSubscribe)
+CONFIG += mobility
+MOBILITY = publishsubscribe
 
diff --git a/tests/auto/qsystemreadwritelock_oop/test/test.pro b/tests/auto/qsystemreadwritelock_oop/test/test.pro
index 639ec6da88..66c771c526 100644
--- a/tests/auto/qsystemreadwritelock_oop/test/test.pro
+++ b/tests/auto/qsystemreadwritelock_oop/test/test.pro
@@ -10,7 +10,8 @@ include(../../../../common.pri)
 # Input 
 SOURCES += ../tst_qsystemreadwritelock_oop.cpp
 
-qtAddLibrary(QtPublishSubscribe)
+CONFIG += mobility
+MOBILITY = publishsubscribe
 
 symbian {
     TARGET.CAPABILITY = ALL -TCB
diff --git a/tests/auto/qsystemscreensaver/qsystemscreensaver.pro b/tests/auto/qsystemscreensaver/qsystemscreensaver.pro
index 408198b371..d74ce9bfb5 100644
--- a/tests/auto/qsystemscreensaver/qsystemscreensaver.pro
+++ b/tests/auto/qsystemscreensaver/qsystemscreensaver.pro
@@ -6,7 +6,8 @@ INCLUDEPATH += ../../../src/systeminfo
 SOURCES  += tst_qsystemscreensaver.cpp
 
 include(../../../common.pri)
-qtAddLibrary(QtSystemInfo)
+CONFIG += mobility
+MOBILITY = systeminfo
 
 symbian {
     TARGET.CAPABILITY = All -TCB -DRM
diff --git a/tests/auto/qsystemstorageinfo/qsystemstorageinfo.pro b/tests/auto/qsystemstorageinfo/qsystemstorageinfo.pro
index 56afab3a4f..245bb05abb 100644
--- a/tests/auto/qsystemstorageinfo/qsystemstorageinfo.pro
+++ b/tests/auto/qsystemstorageinfo/qsystemstorageinfo.pro
@@ -8,7 +8,8 @@ SOURCES  += tst_qsystemstorageinfo.cpp
 INCLUDEPATH += ../../../src/systeminfo
 
 include(../../../common.pri)
-qtAddLibrary(QtSystemInfo)
+CONFIG += mobility
+MOBILITY = systeminfo
 
 symbian {
     TARGET.CAPABILITY = All -TCB -DRM
diff --git a/tests/auto/qvaluespace/qvaluespace.pro b/tests/auto/qvaluespace/qvaluespace.pro
index acd645855a..70cf82cd6d 100644
--- a/tests/auto/qvaluespace/qvaluespace.pro
+++ b/tests/auto/qvaluespace/qvaluespace.pro
@@ -11,7 +11,8 @@ include(../../../common.pri)
 # Input 
 SOURCES += tst_qvaluespace.cpp
 
-qtAddLibrary(QtPublishSubscribe)
+CONFIG += mobility
+MOBILITY = publishsubscribe
 
 symbian {
     TARGET.CAPABILITY = ALL -TCB
diff --git a/tests/auto/qvaluespaceprovider/qvaluespaceprovider.pro b/tests/auto/qvaluespaceprovider/qvaluespaceprovider.pro
index 0a2cdf3f3b..f69544273e 100644
--- a/tests/auto/qvaluespaceprovider/qvaluespaceprovider.pro
+++ b/tests/auto/qvaluespaceprovider/qvaluespaceprovider.pro
@@ -11,7 +11,8 @@ include(../../../common.pri)
 # Input 
 SOURCES += tst_qvaluespaceprovider.cpp
 
-qtAddLibrary(QtPublishSubscribe)
+CONFIG += mobility
+MOBILITY = publishsubscribe
 
 symbian {
     TARGET.CAPABILITY = ALL -TCB
diff --git a/tests/auto/qvaluespacesubscriber/lackey/lackey.pro b/tests/auto/qvaluespacesubscriber/lackey/lackey.pro
index 5e31c3a0b8..f3a76b5fae 100644
--- a/tests/auto/qvaluespacesubscriber/lackey/lackey.pro
+++ b/tests/auto/qvaluespacesubscriber/lackey/lackey.pro
@@ -9,4 +9,5 @@ CONFIG+= testcase
 
 include(../../../../common.pri)
 
-qtAddLibrary(QtPublishSubscribe)
+CONFIG += mobility
+MOBILITY = publishsubscribe
diff --git a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.pro b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.pro
index d8f867408d..f81456cc0b 100644
--- a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.pro
+++ b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.pro
@@ -19,7 +19,8 @@ HEADERS += tst_qvaluespacesubscribershared.h
 
 DEFINES += QT_START_VALUESPACE
 
-qtAddLibrary(QtPublishSubscribe)
+CONFIG += mobility
+MOBILITY = publishsubscribe
 
 symbian {
     TARGET.CAPABILITY = ALL -TCB
diff --git a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.pro b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.pro
index da96031328..ed8c3601af 100644
--- a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.pro
+++ b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.pro
@@ -17,7 +17,8 @@ SOURCES += tst_qvaluespacesubscriber_oop.cpp \
            tst_qvaluespacesubscribershared.cpp
 HEADERS += tst_qvaluespacesubscribershared.h
 
-qtAddLibrary(QtPublishSubscribe)
+CONFIG += mobility
+MOBILITY = publishsubscribe
 
 symbian {
     TARGET.CAPABILITY = ALL -TCB
diff --git a/tests/auto/qvideowidget/qvideowidget.pro b/tests/auto/qvideowidget/qvideowidget.pro
index 9384fa6a5d..2cd0c38a3e 100644
--- a/tests/auto/qvideowidget/qvideowidget.pro
+++ b/tests/auto/qvideowidget/qvideowidget.pro
@@ -8,4 +8,5 @@ include (../../../common.pri)
 
 SOURCES += tst_qvideowidget.cpp
 
-qtAddLibrary(QtMedia)
+CONFIG += mobility
+MOBILITY = multimedia
diff --git a/tests/auto/servicedatabase/servicedatabase.pro b/tests/auto/servicedatabase/servicedatabase.pro
index 6c6b950240..bbcd2cd7eb 100644
--- a/tests/auto/servicedatabase/servicedatabase.pro
+++ b/tests/auto/servicedatabase/servicedatabase.pro
@@ -23,7 +23,8 @@ include(../../../common.pri)
 # Input 
 SOURCES += tst_servicedatabase.cpp
             
-qtAddLibrary(QtServiceFramework)
+CONFIG += mobility
+MOBILITY = serviceframework
 
 symbian {
     libBlock = \
diff --git a/tests/auto/servicemetadata/servicemetadata.pro b/tests/auto/servicemetadata/servicemetadata.pro
index 667ac9fe0d..d6f61d247b 100644
--- a/tests/auto/servicemetadata/servicemetadata.pro
+++ b/tests/auto/servicemetadata/servicemetadata.pro
@@ -28,4 +28,5 @@ symbian {
     TARGET.CAPABILITY = ALL -TCB
 }
 
-qtAddLibrary(QtServiceFramework)
+CONFIG += mobility
+MOBILITY = serviceframework
diff --git a/tests/bearerex/bearerex.pro b/tests/bearerex/bearerex.pro
index 6aa401bda4..e8e3dbc163 100644
--- a/tests/bearerex/bearerex.pro
+++ b/tests/bearerex/bearerex.pro
@@ -31,6 +31,8 @@ symbian: {
     bearerex.path = /sys/bin
     DEPLOYMENT += bearerex
 
-    qtAddLibrary(QtBearer)
+    CONFIG += mobility
+    MOBILITY = bearer
+
     TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData
 }
diff --git a/tests/messagingex/messagingex.pro b/tests/messagingex/messagingex.pro
index 9d76093d67..06fe4545dc 100644
--- a/tests/messagingex/messagingex.pro
+++ b/tests/messagingex/messagingex.pro
@@ -7,7 +7,8 @@ include(../../common.pri)
 
 # Build against the messaging library
 INCLUDEPATH += $$SOURCE_DIR/src/messaging
-qtAddLibrary(QtMessaging)
+CONFIG += mobility
+MOBILITY = messaging
 
 HEADERS += \
     messagingex.h
diff --git a/tests/networkmanager/networkmanager.pro b/tests/networkmanager/networkmanager.pro
index 31b2af10f3..7ff370aaef 100644
--- a/tests/networkmanager/networkmanager.pro
+++ b/tests/networkmanager/networkmanager.pro
@@ -12,7 +12,8 @@ requires(contains(QT_CONFIG,dbus))
 INCLUDEPATH += ../../src/bearer
 include(../../common.pri)
 
-qtAddLibrary(QtBearer)
+CONFIG += mobility
+MOBILITY = bearer
 
 #MOC_DIR = .moc
 #OBJECTS_DIR = .obj
diff --git a/tests/sampleserviceplugin/sampleserviceplugin.pro b/tests/sampleserviceplugin/sampleserviceplugin.pro
index 7b6cfcfac7..8797e85c7c 100644
--- a/tests/sampleserviceplugin/sampleserviceplugin.pro
+++ b/tests/sampleserviceplugin/sampleserviceplugin.pro
@@ -7,7 +7,8 @@ TARGET        = tst_sfw_sampleserviceplugin
 DESTDIR = .
 
 include(../../common.pri)
-qtAddLibrary(QtServiceFramework)
+CONFIG += mobility
+MOBILITY = serviceframework
 
 symbian {
     load(data_caging_paths)
diff --git a/tests/sampleserviceplugin2/sampleserviceplugin2.pro b/tests/sampleserviceplugin2/sampleserviceplugin2.pro
index e557e8bdab..df25c9682f 100644
--- a/tests/sampleserviceplugin2/sampleserviceplugin2.pro
+++ b/tests/sampleserviceplugin2/sampleserviceplugin2.pro
@@ -7,7 +7,8 @@ TARGET        = tst_sfw_sampleserviceplugin2
 DESTDIR = .
 
 include(../../common.pri)
-qtAddLibrary(QtServiceFramework)
+CONFIG += mobility
+MOBILITY = serviceframework
 
 symbian {
     load(data_caging_paths)
diff --git a/tests/testservice2/testservice2.pro b/tests/testservice2/testservice2.pro
index 4cfe7adc1b..39d81c57b1 100644
--- a/tests/testservice2/testservice2.pro
+++ b/tests/testservice2/testservice2.pro
@@ -7,7 +7,8 @@ TARGET        = tst_sfw_testservice2plugin
 DESTDIR = .
 
 include(../../common.pri)
-qtAddLibrary(QtServiceFramework)
+CONFIG += mobility
+MOBILITY = serviceframework
 
 symbian {
     load(data_caging_paths)
diff --git a/tools/qcrmlgen/qcrmlgen.pro b/tools/qcrmlgen/qcrmlgen.pro
index 7bb36aed4e..c962c4c8f3 100644
--- a/tools/qcrmlgen/qcrmlgen.pro
+++ b/tools/qcrmlgen/qcrmlgen.pro
@@ -14,5 +14,6 @@ SOURCES=\
     qcrmlparser.cpp
 
 include(../../common.pri)
-qtAddLibrary(QtPublishSubscribe)
+CONFIG += mobility
+MOBILITY = publishsubscribe
 include(../../features/deploy.pri)
diff --git a/tools/servicefw/servicefw.pro b/tools/servicefw/servicefw.pro
index 92faad0c4f..09c99648ec 100644
--- a/tools/servicefw/servicefw.pro
+++ b/tools/servicefw/servicefw.pro
@@ -1,6 +1,7 @@
 TEMPLATE=app
 TARGET=servicefw
-CONFIG+=console
+CONFIG+=console mobility
+MOBILITY = serviceframework
 
 INCLUDEPATH += ../../src/serviceframework
 
@@ -9,4 +10,3 @@ SOURCES=servicefw.cpp
 include(../../common.pri)
 
 include(../../features/deploy.pri)
-qtAddLibrary(QtServiceFramework)
diff --git a/tools/vsexplorer/vsexplorer.pro b/tools/vsexplorer/vsexplorer.pro
index 9850600e9d..f179973530 100644
--- a/tools/vsexplorer/vsexplorer.pro
+++ b/tools/vsexplorer/vsexplorer.pro
@@ -15,6 +15,7 @@ SOURCES=\
 
 include(../../common.pri)
 
-qtAddLibrary(QtPublishSubscribe)
+CONFIG += mobility
+MOBILITY = publishsubscribe
 
 include(../../features/deploy.pri)