Merge branch 'master' into alignedtimer

Conflicts:
	src/systeminfo/systeminfo.pro

1 files changed, 22 insertions, 17 deletions

diff --git a/examples/examples.pro b/examples/examples.pro
index 046163f6b3..82ec921f94 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -33,22 +33,18 @@ contains(mobility_modules,location) {
         SUBDIRS += landmarkbrowser
     }
 
-#    contains(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 6) {
-#    	SUBDIRS += geoservicedemo \
-#                    mapviewer
-#
-#    } else {
-#        contains(mobility_modules,bearer) {
-#    	    SUBDIRS += geoservicedemo \
-#                       mapviewer
-#        }
-#    }
-
-    contains(mobility_modules,bearer) {
-    	SUBDIRS += flickrdemo \
+    equals(QT_MAJOR_VERSION, 4):lessThan(QT_MINOR_VERSION, 7) {
+        contains(mobility_modules,bearer) {
+    	    SUBDIRS +=  flickrdemo \
+                        geoservicedemo \
+                        mapviewer
+        }
+    } else {
+        SUBDIRS +=  flickrdemo \
                     geoservicedemo \
                     mapviewer
-      }  
+    }
+
     contains(QT_CONFIG, declarative) {
         SUBDIRS += declarative-location
     }
@@ -102,9 +98,8 @@ contains(mobility_modules,multimedia) {
 contains(qmf_enabled,yes)|wince*|win32|symbian|maemo5|maemo6 {
     contains(mobility_modules,messaging) {
         !win32-g++ {
-	    SUBDIRS += \
-                querymessages \
-                writemessage
+            SUBDIRS += writemessage
+            !symbian:SUBDIRS += querymessages
 
             contains(mobility_modules,contacts) {
                 SUBDIRS += keepintouch
@@ -148,6 +143,16 @@ contains(mobility_modules, feedback) {
     SUBDIRS += hapticsplayer hapticsquare # this not a good UI for mobile screens at the moment
 }
 
+# Connectivity
+contains(mobility_modules,connectivity) {
+    SUBDIRS += connectivity
+}
+
+# Connectivity
+contains(mobility_modules,connectivity) {
+    !win32:SUBDIRS += btscanner btchat
+}
+
 sources.path = $$QT_MOBILITY_EXAMPLES
 
 INSTALLS += sources