Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobility

Conflicts:
	configure.bat
	doc/html/annotated.html
	doc/html/battery-charge.html
	doc/html/classes.html
	doc/html/contacts.html
	doc/html/contactsengines.html
	doc/html/contactssync.html
	doc/html/creating-a-sensor-plugin.html
	doc/html/declarative-sfw-dialer.html
	doc/html/declarative-sfw-notes.html
	doc/html/functions.html
	doc/html/index.html
	doc/html/installation.html
	doc/html/location-overview.html
	doc/html/messaging.html
	doc/html/multimedia.html
	doc/html/player-player-cpp.html
	doc/html/publ-subs.html
	doc/html/qabstractsecuritysession.html
	doc/html/qaccelerometer-members.html
	doc/html/qambientlightsensor-members.html
	doc/html/qaudiocapturesource-members.html
	doc/html/qaudiocapturesource.html
	doc/html/qaudioencodercontrol.html
	doc/html/qaudioencodersettings-members.html
	doc/html/qaudioencodersettings.html
	doc/html/qaudioendpointselector.html
	doc/html/qcompass-members.html
	doc/html/qcontactabstractrequest.html
	doc/html/qcontactdetail.html
	doc/html/qcontactdetaildefinitionfetchrequest.html
	doc/html/qcontactdetaildefinitionremoverequest.html
	doc/html/qcontactdetaildefinitionsaverequest.html
	doc/html/qcontactdetailfilter.html
	doc/html/qcontactfetchrequest.html
	doc/html/qcontactlocalidfetchrequest.html
	doc/html/qcontactmanager.html
	doc/html/qcontactrelationshipfetchrequest.html
	doc/html/qcontactrelationshipremoverequest.html
	doc/html/qcontactrelationshipsaverequest.html
	doc/html/qcontactremoverequest.html
	doc/html/qcontactsaverequest.html
	doc/html/qcontacturl-members.html
	doc/html/qgeopositioninfo.html
	doc/html/qgraphicsvideoitem-members.html
	doc/html/qgraphicsvideoitem.html
	doc/html/qimageencodercontrol.html
	doc/html/qimageencodersettings-members.html
	doc/html/qimageencodersettings.html
	doc/html/qmagnetometer-members.html
	doc/html/qmediabindableinterface-members.html
	doc/html/qmediacontainercontrol.html
	doc/html/qmediacontrol.html
	doc/html/qmediaimageviewer-members.html
	doc/html/qmediaimageviewer.html
	doc/html/qmediaobject-members.html
	doc/html/qmediaobject.html
	doc/html/qmediaplayer-members.html
	doc/html/qmediaplayer.html
	doc/html/qmediaplayercontrol.html
	doc/html/qmediaplaylist-members.html
	doc/html/qmediaplaylist.html
	doc/html/qmediaplaylistcontrol.html
	doc/html/qmediaplaylistsourcecontrol-members.html
	doc/html/qmediarecorder-members.html
	doc/html/qmediarecorder.html
	doc/html/qmediarecordercontrol-members.html
	doc/html/qmediarecordercontrol.html
	doc/html/qmediaservice-members.html
	doc/html/qmediaservice.html
	doc/html/qmediaserviceprovider-members.html
	doc/html/qmediaserviceprovider.html
	doc/html/qmediaservicesupportedformatsinterface-members.html
	doc/html/qmediaservicesupportedformatsinterface.html
	doc/html/qmediastreamscontrol-members.html
	doc/html/qmediastreamscontrol.html
	doc/html/qmediatimerange.html
	doc/html/qmetadatacontrol.html
	doc/html/qmetadatawritercontrol-members.html
	doc/html/qmlcontacts-qmlcontactdetailfield-h.html
	doc/html/qmlcontacts-qmlcontacts-pro.html
	doc/html/qmlcontacts-qmlcontacts-qrc.html
	doc/html/qorientationsensor-members.html
	doc/html/qproximitysensor-members.html
	doc/html/qradiotuner-members.html
	doc/html/qradiotuner.html
	doc/html/qradiotunercontrol-members.html
	doc/html/qradiotunercontrol.html
	doc/html/qrotationsensor-members.html
	doc/html/qservicefilter.html
	doc/html/qserviceinterfacedescriptor.html
	doc/html/qsystemdeviceinfo-members.html
	doc/html/qsystemdeviceinfo.html
	doc/html/qsystemdisplayinfo-members.html
	doc/html/qsystemdisplayinfo.html
	doc/html/qsysteminfo-members.html
	doc/html/qsysteminfo.html
	doc/html/qsystemnetworkinfo-members.html
	doc/html/qsystemnetworkinfo.html
	doc/html/qsystemscreensaver-members.html
	doc/html/qsystemscreensaver.html
	doc/html/qsystemstorageinfo-members.html
	doc/html/qsystemstorageinfo.html
	doc/html/qt-mobility-project-library.dcf
	doc/html/qt-mobility-project-library.index
	doc/html/qtapsensor-members.html
	doc/html/qtmobility-known-issues.html
	doc/html/qtmobility.qhp
	doc/html/qtmultimediakit.html
	doc/html/quickstart.html
	doc/html/qvideoencodercontrol.html
	doc/html/qvideoencodersettings-members.html
	doc/html/qvideoencodersettings.html
	doc/html/qvideooutputcontrol.html
	doc/html/qvideorenderercontrol.html
	doc/html/qvideowidget-members.html
	doc/html/qvideowidget.html
	doc/html/qvideowidgetcontrol.html
	doc/html/qvideowindowcontrol.html
	doc/html/radio-radio-pro.html
	doc/html/sensors-api.html
	doc/html/service-frameworks.html
	doc/html/sysinfo.html
	doc/html/systeminfo.html
	doc/html/versit.html
	src/global/qmobilityglobal.h

1 files changed, 30 insertions, 24 deletions

diff --git a/configure b/configure
index c0a1be973e..86595b4924 100755
--- a/configure
+++ b/configure
@@ -88,6 +88,7 @@ QT_MOBILITY_BIN=
 QT_MOBILITY_PLUGINS=
 BUILD_UNITTESTS=
 BUILD_EXAMPLES=
+BUILD_DEMOS=
 BUILD_DOCS=yes
 BUILD_TOOLS=yes
 RELEASEMODE=
@@ -129,6 +130,7 @@ usage()
     echo "                    Note, this adds test symbols to all libraries"
     echo "                    and should not be used for release builds."
     echo "-examples ......... Build example applications"
+    echo "-demos ............ Build demo applications"
     echo "-no-docs .......... Do not build documentation (build by default)"
     echo "-no-tools ......... Do not build tools (build by default)"
     echo "-modules <list> ... Restrict list of modules to build (default all supported)"
@@ -181,6 +183,9 @@ while [ "$#" -gt 0 ]; do
         -tests)
             BUILD_UNITTESTS="yes"
             ;;
+        -demos)
+            BUILD_DEMOS="yes"
+            ;;
         -examples)
             BUILD_EXAMPLES="yes"
             ;;
@@ -383,6 +388,12 @@ else
     echo "build_examples = yes" >> "$CONFIG_IN"
 fi
 
+if [ -z "$BUILD_DEMOS" ]; then
+    echo "build_demos = no" >> "$CONFIG_IN"
+else
+    echo "build_demos = yes" >> "$CONFIG_IN"
+fi
+
 if [ -z "$BUILD_DOCS" ]; then
     echo "build_docs = no" >> "$CONFIG_IN"
 else
@@ -468,13 +479,6 @@ else
     echo "sensord_enabled = no" >> "$CONFIG_IN"
 fi
 
-# Now module selection
-# using 'expr match ....' should help a bit
-#if [ -n "$MOBILITY_MODULES_UNPARSED" ]; then
-    # In theory we should do some sanity checking here.
-#    MOBILITY_MODULES="$MOBILITY_MODULES_UNPARSED"
-#fi
-
 # It's a lot easier to make qmake do the dependency checking...
 echo "mobility_modules = $MOBILITY_MODULES" >> "$CONFIG_IN"
 echo "contains(mobility_modules,versit): mobility_modules *= contacts" >> "$CONFIG_IN"
@@ -492,42 +496,44 @@ mkdir $shadowpath/include
 for module in $MOBILITY_MODULES; do
     case "$module" in 
         bearer)
-            $relpath/bin/syncheaders $shadowpath/include/QtmBearer $relpath/src/bearer
+            $relpath/bin/syncheaders $shadowpath/include/QtBearer $relpath/src/bearer
             ;;
         publishsubscribe)
-            $relpath/bin/syncheaders $shadowpath/include/QtmPubSub $relpath/src/publishsubscribe
+            $relpath/bin/syncheaders $shadowpath/include/QtPublishSubscribe $relpath/src/publishsubscribe
             ;;
         location)
-            $relpath/bin/syncheaders $shadowpath/include/QtmLocation $relpath/src/location
+            $relpath/bin/syncheaders $shadowpath/include/QtLocation $relpath/src/location
             ;;
         serviceframework)
-            $relpath/bin/syncheaders $shadowpath/include/QtmServiceFramework $relpath/src/serviceframework
+            $relpath/bin/syncheaders $shadowpath/include/QtServiceFramework $relpath/src/serviceframework
             ;;
         systeminfo)
-            $relpath/bin/syncheaders $shadowpath/include/QtmSystemInfo $relpath/src/systeminfo
+            $relpath/bin/syncheaders $shadowpath/include/QtSystemInfo $relpath/src/systeminfo
             ;;
         contacts)
-            $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts
-            $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts/details
-            $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts/requests
-            $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts/filters
+            $relpath/bin/syncheaders $shadowpath/include/QtContacts $relpath/src/contacts
+            $relpath/bin/syncheaders $shadowpath/include/QtContacts $relpath/src/contacts/details
+            $relpath/bin/syncheaders $shadowpath/include/QtContacts $relpath/src/contacts/requests
+            $relpath/bin/syncheaders $shadowpath/include/QtContacts $relpath/src/contacts/filters
             ;;
         multimedia)
-            $relpath/bin/syncheaders $shadowpath/include/QtmMedia $relpath/src/multimedia
+            $relpath/bin/syncheaders $shadowpath/include/QtMultimediaKit $relpath/src/multimedia
+            $relpath/bin/syncheaders $shadowpath/include/QtMultimediaKit $relpath/src/multimedia/audio
+            $relpath/bin/syncheaders $shadowpath/include/QtMultimediaKit $relpath/src/multimedia/video
             ;;
         messaging)
-            $relpath/bin/syncheaders $shadowpath/include/QtmMessaging $relpath/src/messaging
+            $relpath/bin/syncheaders $shadowpath/include/QtMessaging $relpath/src/messaging
             ;;
         versit)
             #versit implies contacts
-            $relpath/bin/syncheaders $shadowpath/include/QtmVersit $relpath/src/versit
-            $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts
-            $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts/details
-            $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts/requests
-            $relpath/bin/syncheaders $shadowpath/include/QtmContacts $relpath/src/contacts/filters
+            $relpath/bin/syncheaders $shadowpath/include/QtVersit $relpath/src/versit
+            $relpath/bin/syncheaders $shadowpath/include/QtContacts $relpath/src/contacts
+            $relpath/bin/syncheaders $shadowpath/include/QtContacts $relpath/src/contacts/details
+            $relpath/bin/syncheaders $shadowpath/include/QtContacts $relpath/src/contacts/requests
+            $relpath/bin/syncheaders $shadowpath/include/QtContacts $relpath/src/contacts/filters
             ;;
         sensors)
-            $relpath/bin/syncheaders $shadowpath/include/QtmSensors $relpath/src/sensors
+            $relpath/bin/syncheaders $shadowpath/include/QtSensors $relpath/src/sensors
             ;;
         gallery)
             $relpath/bin/syncheaders $shadowpath/include $relpath/src/gallery