--- a/qtmobility/qtmobility.pro	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/qtmobility.pro	Wed Jun 23 19:08:38 2010 +0300
@@ -43,17 +43,25 @@
     win32:system(type $${QT_MOBILITY_SOURCE_TREE}\features\mobility.prf.template >> $$PRF_OUTPUT)
     symbian:system(type $${QT_MOBILITY_SOURCE_TREE}\features\mobility.prf.template >> $$PRF_OUTPUT)
 
+    PRF_CONFIG=$${QT_MOBILITY_BUILD_TREE}/features/mobilityconfig.prf
+    system(echo MOBILITY_CONFIG=$${mobility_modules} > $$PRF_CONFIG)
+
     #symbian does not generate make install rule. we have to copy prf manually 
     symbian {
         FORMATDIR=$$[QT_INSTALL_DATA]\mkspecs\features
         FORMATDIR=$$replace(FORMATDIR,/,\\ )
         system(copy "$${QT_MOBILITY_BUILD_TREE}\features\mobility.prf $$FORMATDIR")
+        system(copy "$${QT_MOBILITY_BUILD_TREE}\features\mobilityconfig.prf $$FORMATDIR")
     }
 
+    # install config file
+    config.path = $$[QT_INSTALL_DATA]/mkspecs/features
+    config.files = $$QT_MOBILITY_BUILD_TREE/features/mobilityconfig.prf
+
     # install feature file
     feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
     feature.files = $$QT_MOBILITY_BUILD_TREE/features/mobility.prf
-    INSTALLS += feature
+    INSTALLS += feature config
 }
 
 TEMPLATE = subdirs
@@ -78,6 +86,9 @@
 contains(build_unit_tests, yes):SUBDIRS+=tests
 contains(build_examples, yes):SUBDIRS+=examples
 
+#updating and deployment of translations requires Qt 4.6.3/qtPrepareTool
+!symbian:defined(qtPrepareTool):SUBDIRS += translations
+
 # install Qt style headers
 qtmheaders.path = $${QT_MOBILITY_INCLUDE}
 
@@ -86,7 +97,7 @@
                          $${QT_MOBILITY_BUILD_TREE}/include/QtmContacts/* \
                          $${QT_MOBILITY_BUILD_TREE}/include/QtmLocation/* \
                          $${QT_MOBILITY_BUILD_TREE}/include/QtmMessaging/* \
-                         $${QT_MOBILITY_BUILD_TREE}/include/QtmMedia/* \
+                         $${QT_MOBILITY_BUILD_TREE}/include/QtMultimedia/* \
                          $${QT_MOBILITY_BUILD_TREE}/include/QtmPubSub/* \
                          $${QT_MOBILITY_BUILD_TREE}/include/QtmServiceFramework/* \
                          $${QT_MOBILITY_BUILD_TREE}/include/QtmVersit/* \
@@ -94,16 +105,6 @@
                          $${QT_MOBILITY_BUILD_TREE}/include/QtmSensors/*
     INSTALLS += qtmheaders
 } else {
-
-#    Can we assume the path exists?
-#    paths = $$MW_LAYER_PUBLIC_EXPORT_PATH("") \
-#            $$APP_LAYER_PUBLIC_EXPORT_PATH("")
-#    for(i, paths) {
-#        exportPath=$$EPOCROOT"."$$dirname($$i)
-#        nativePath=$$replace(exportPath, /,\)
-#        !exists($$nativePath):system($$QMAKE_MKDIR $$nativePath)
-#    }
-
     #absolute path does not work and so is shadow building for Symbian
     qtmAppHeaders = include/QtmContacts/* \
                           include/QtmVersit/*
@@ -111,7 +112,7 @@
     qtmMwHeaders = include/QtmBearer/* \
                        include/QtmLocation/* \
                        include/QtmMessaging/* \
-                       include/QtmMedia/* \
+                       include/QtMultimedia/* \
                        include/QtmPubSub/* \
                        include/QtmServiceFramework/* \
                        include/QtmSystemInfo/* \