Merge branch 'master' of ../qtm-contacts

Conflicts:
	configure
	configure.bat
	examples/examples.pro
	qtmobility.pro
	src/global/qmobilityglobal.h

1 files changed, 38 insertions, 51 deletions

diff --git a/configure b/configure
index f0e65bb33d..d60f3c9c57 100755
--- a/configure
+++ b/configure
@@ -58,17 +58,16 @@ isAbsPath() {
 # maemo we do not want to follow symbolic links that are 
 # introduced by scratchbox
 absPath() {
-    
     if [ "$2" = "maemo5" -o "$2" = "maemo6" ]; then
         if [ `isAbsPath $1` = '1' ]; then
             echo $1;
         else
-            echo "Relative prefix paths are not supported for Maemo"
+            echo >&2 "Relative prefix/bin/lib/header/plugin paths are not supported for Maemo"
             exit 1;
         fi
     else
-        RESULT=`(cd "$1"; /bin/pwd)`
-        echo $RESULT
+        PATH=`$relpath/bin/pathhelper $1`
+        echo $PATH
     fi
 }
 
@@ -312,24 +311,20 @@ if [ -n "$LINUX_TARGET" ]; then
 fi
 
 #process PREFIX
-if [ -d "$QT_MOBILITY_PREFIX" ]; then
-    QT_MOBILITY_PREFIX=`absPath $QT_MOBILITY_PREFIX $LINUX_TARGET`
-else
-    mkdir -p "$QT_MOBILITY_PREFIX"
-    QT_MOBILITY_PREFIX=`absPath $QT_MOBILITY_PREFIX $LINUX_TARGET`
-    rm -rf "$QT_MOBILITY_PREFIX"
+QT_MOBILITY_PREFIX=`absPath $QT_MOBILITY_PREFIX $LINUX_TARGET`
+if [ "$?" -eq "1" ]; then
+    exit 1
 fi
 echo "QT_MOBILITY_PREFIX = $QT_MOBILITY_PREFIX" >> "$CONFIG_IN"
 
 #process include path
 if [ -z "$QT_MOBILITY_INCLUDE" ]; then
     QT_MOBILITY_INCLUDE="$QT_MOBILITY_PREFIX/include"
-elif [ -d "$QT_MOBILITY_INCLUDE" ]; then
-    QT_MOBILITY_INCLUDE=`absPath $QT_MOBILITY_INCLUDE $LINUX_TARGET`
 else
-    mkdir -p "$QT_MOBILITY_INCLUDE"
     QT_MOBILITY_INCLUDE=`absPath $QT_MOBILITY_INCLUDE $LINUX_TARGET`
-    rm -rf "$QT_MOBILITY_INCLUDE"
+    if [ "$?" -eq "1" ]; then
+        exit 1
+    fi
 fi
 echo "QT_MOBILITY_INCLUDE = $QT_MOBILITY_INCLUDE" >> "$CONFIG_IN"
 
@@ -337,36 +332,33 @@ echo "QT_MOBILITY_INCLUDE = $QT_MOBILITY_INCLUDE" >> "$CONFIG_IN"
 #process library path
 if [ -z "$QT_MOBILITY_LIB" ]; then
     QT_MOBILITY_LIB="$QT_MOBILITY_PREFIX/$LIB_PATH"
-elif [ -d "$QT_MOBILITY_LIB" ]; then
-    QT_MOBILITY_LIB=`absPath $QT_MOBILITY_LIB $LINUX_TARGET`
 else
-    mkdir -p "$QT_MOBILITY_LIB"
     QT_MOBILITY_LIB=`absPath $QT_MOBILITY_LIB $LINUX_TARGET`
-    rm -rf "$QT_MOBILITY_LIB"
+    if [ "$?" -eq "1" ]; then
+        exit 1
+    fi
 fi
 echo "QT_MOBILITY_LIB = $QT_MOBILITY_LIB" >> "$CONFIG_IN"
 
 #process bin path
 if [ -z "$QT_MOBILITY_BIN" ]; then
     QT_MOBILITY_BIN="$QT_MOBILITY_PREFIX/$BIN_PATH"
-elif [ -d "$QT_MOBILITY_BIN" ]; then
-    QT_MOBILITY_BIN=`absPath $QT_MOBILITY_BIN $LINUX_TARGET`
 else
-    mkdir -p "$QT_MOBILITY_BIN"
     QT_MOBILITY_BIN=`absPath $QT_MOBILITY_BIN $LINUX_TARGET`
-    rm -rf "$QT_MOBILITY_BIN"
+    if [ "$?" -eq "1" ]; then
+        exit 1
+    fi
 fi
 echo "QT_MOBILITY_BIN = $QT_MOBILITY_BIN" >> "$CONFIG_IN"
 
 #process plugin path
 if [ -z "$QT_MOBILITY_PLUGINS" ]; then
     QT_MOBILITY_PLUGINS="$QT_MOBILITY_PREFIX/$PLUGIN_PATH"
-elif [ -d "$QT_MOBILITY_PLUGINS" ]; then
-    QT_MOBILITY_PLUGINS=`absPath $QT_MOBILITY_PLUGINS $LINUX_TARGET`
 else
-    mkdir -p "$QT_MOBILITY_PLUGINS"
     QT_MOBILITY_PLUGINS=`absPath $QT_MOBILITY_PLUGINS $LINUX_TARGET`
-    rm -rf "$QT_MOBILITY_PLUGINS"
+    if [ "$?" -eq "1" ]; then
+        exit 1
+    fi
 fi
 echo "QT_MOBILITY_PLUGINS = $QT_MOBILITY_PLUGINS" >> "$CONFIG_IN"
 
@@ -476,13 +468,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 organizer" >> "$CONFIG_IN"
@@ -500,43 +485,45 @@ 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 & organizer
-            $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/QtmOrganizer $relpath/src/organizer
+            $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
+            $relpath/bin/syncheaders $shadowpath/include/QtOrganizer $relpath/src/organizer
             ;;
         sensors)
-            $relpath/bin/syncheaders $shadowpath/include/QtmSensors $relpath/src/sensors
+            $relpath/bin/syncheaders $shadowpath/include/QtSensors $relpath/src/sensors
             ;;
         organizer)
             $relpath/bin/syncheaders $shadowpath/include/QtmOrganizer $relpath/src/organizer