Revert "Revert "Merge branch 'master' of ../../mainline/qtmobility""

This reverts commit e38ebf00c0b539a7756b21946693e201269b976a.

Conflicts:

	examples/telephony/dialer/dialer.pro
	src/s60installs/bwins/QtMultimediaKitu.def
	src/s60installs/bwins/QtServiceFrameworku.def
	src/s60installs/bwins/QtSystemInfou.def
	src/s60installs/eabi/QtSystemInfou.def

1 files changed, 10 insertions, 2 deletions

diff --git a/qtmobility.pro b/qtmobility.pro
index 135ed85f28..8050d78f35 100644
--- a/qtmobility.pro
+++ b/qtmobility.pro
@@ -89,6 +89,7 @@ contains(build_docs, yes) {
 
 contains(build_unit_tests, yes):SUBDIRS+=tests
 contains(build_examples, yes):SUBDIRS+=examples
+contains(build_docs, yes):SUBDIRS+=demos
 
 #updating and deployment of translations requires Qt 4.6.3/qtPrepareTool
 !symbian:defined(qtPrepareTool):SUBDIRS += translations
@@ -155,6 +156,12 @@ contains(build_examples, yes):SUBDIRS+=examples
         qtmheaderssensors.files = $${QT_MOBILITY_BUILD_TREE}/include/QtSensors/*
         INSTALLS += qtmheaderssensors
     }
+
+    contains(mobility_modules,organizer) {
+        qtmheadersorganizer.path = $${QT_MOBILITY_INCLUDE}/QtOrganizer
+        qtmheadersorganizer.files = $${QT_MOBILITY_BUILD_TREE}/include/QtOrganizer/*
+        INSTALLS += qtmheadersorganizer
+    }
 } else {
     #absolute path does not work and 
     #include <QtMyLibrary/class.h> style does not work either
@@ -168,7 +175,8 @@ contains(build_examples, yes):SUBDIRS+=examples
                        include/QtPublishSubscribe/* \
                        include/QtServiceFramework/* \
                        include/QtSystemInfo/* \
-                       include/QtSensors/*
+                       include/QtSensors/* \
+                       include/QtOrganizer/*
 
     contains(mobility_modules,contacts|versit) {
         for(api, qtmAppHeaders) {
@@ -182,7 +190,7 @@ contains(build_examples, yes):SUBDIRS+=examples
         }
     }
 
-    contains(mobility_modules,serviceframework|location|bearer|publishsubscribe|systeminfo|multimedia|messaging) {
+    contains(mobility_modules,serviceframework|location|bearer|publishsubscribe|systeminfo|multimedia|messaging|organizer) {
         for(api, qtmMwHeaders) {
             INCLUDEFILES=$$files($$api);
             #files() attaches a ';' at the end which we need to remove