--- a/qtcontactsmobility/src/src.pro	Fri Apr 16 14:53:18 2010 +0300
+++ b/qtcontactsmobility/src/src.pro	Mon May 03 12:24:20 2010 +0300
@@ -1,10 +1,7 @@
-include(../pathconfig.pri)
-include($$QT_MOBILITY_BUILD_TREE/config.pri)
+include(../staticconfig.pri)
 
 TEMPLATE = subdirs
-
-# Not for MCL..
-exists(global):SUBDIRS += global
+SUBDIRS += global
 
 contains(mobility_modules,serviceframework) {
     SUBDIRS += serviceframework
@@ -37,8 +34,8 @@
 versit.target=sub-versit
 versit.depends=contacts
 
-contains(mobility_modules,messaging) {
-    contains(qmf_enabled, yes)|wince*|win32|symbian|maemo6 {
+contains(qmf_enabled, yes)|wince*|win32|symbian|maemo5 {
+    contains(mobility_modules,messaging) {
         !win32-g++:SUBDIRS += messaging
     }
 }