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

Conflicts:
	configure
	configure.bat
	features/mobility.prf.template
	plugins/plugins.pro
	src/global/qmobilityglobal.h
	src/src.pro

1 files changed, 58 insertions, 16 deletions

diff --git a/configure b/configure
index 18e419b0f1..9c473f3e8b 100755
--- a/configure
+++ b/configure
@@ -55,7 +55,7 @@ isAbsPath() {
 # Returns the absolute path for $1 for target $2
 # as an example $2 might have value "maemo5".
 # This is required because when building in scratchbox for
-# maemo we do not want to follow symbolic links that are 
+# maemo we do not want to follow symbolic links that are
 # introduced by scratchbox
 absPath() {
     if [ "$2" = "maemo5" -o "$2" = "maemo6" ]; then
@@ -86,6 +86,8 @@ QT_MOBILITY_INCLUDE=
 QT_MOBILITY_LIB=
 QT_MOBILITY_BIN=
 QT_MOBILITY_PLUGINS=
+QT_MOBILITY_EXAMPLES=
+QT_MOBILITY_DEMOS=
 BUILD_UNITTESTS=
 BUILD_EXAMPLES=
 BUILD_DEMOS=
@@ -99,7 +101,7 @@ LIB_PATH="lib"
 BIN_PATH="bin"
 PLUGIN_PATH="plugins"
 MAC_SDK=
-MOBILITY_MODULES="bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors feedback"
+MOBILITY_MODULES="bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors organizer telephony feedback"
 MOBILITY_MODULES_UNPARSED=
 QMKSPEC=
 OS="other"
@@ -123,6 +125,10 @@ usage()
     echo "                    (default PREFIX/bin)"
     echo "-plugindir <dir> .. Plug-ins will be installed to <dir>"
     echo "                    (default PREFIX/plugins)"
+    echo "-demosdir <dir> ... Demos will be installed to <dir>"
+    echo "                    (default PREFIX/bin)"
+    echo "-examplesdir <dir>  Examples will be installed to <dir>"
+    echo "                    (default PREFIX/bin)"
     echo "-debug ............ Build with debugging symbols"
     echo "-release .......... Build without debugging symbols"
     echo "-silent ........... Reduces build output"
@@ -135,14 +141,14 @@ usage()
     echo "-no-tools ......... Do not build tools (build by default)"
     echo "-modules <list> ... Restrict list of modules to build (default all supported)"
     echo "                    Choose from: bearer contacts location publishsubscribe"
-    echo "                    messaging multimedia systeminfo serviceframework versit"
-    echo "                    sensors feedback"
+    echo "                    messaging multimedia systeminfo serviceframework telephony"
+    echo "                    sensors versit organizer feedback"
     echo "                    Modules should be separated by a space and surrounded"
     echo "                    by double quotation. If a selected module depends on other modules"
     echo "                    those modules (and their dependencies) will automatically be enabled."
     echo "-maemo6 ........... Build Qt Mobility for Maemo6 (Harmattan)."
-    echo "-maemo5 ........... Build Qt Mobility for Maemo5 (Fremantle)."
-    echo "-sdk <sdk>..........Build using Apple provided SDK <path/to/sdk>."
+    echo "-maemo5 ........... Build Qt Mobility for Maemo5 (Freemantle)."
+    echo "-sdk <sdk>......... Build using Apple provided SDK <path/to/sdk>."
     echo "                    example: -sdk /Developer/SDKs/MacOSX10.6.sdk"
     echo
     
@@ -179,6 +185,14 @@ while [ "$#" -gt 0 ]; do
             QT_MOBILITY_PLUGINS="$2"
             shift
             ;;
+        -examplesdir)
+            QT_MOBILITY_EXAMPLES="$2"
+            shift
+            ;;
+        -demosdir)
+            QT_MOBILITY_DEMOS="$2"
+            shift
+            ;;
         -tests)
             BUILD_UNITTESTS="yes"
             ;;
@@ -219,7 +233,7 @@ while [ "$#" -gt 0 ]; do
             MOBILITY_MODULES=
             for m in $MOBILITY_MODULES_UNPARSED; do
                 case "$m" in
-                    bearer|contacts|location|messaging|multimedia|publishsubscribe|serviceframework|systeminfo|versit|sensors|feedback)
+                    bearer|contacts|location|messaging|multimedia|publishsubscribe|serviceframework|systeminfo|sensors|telephony|versit|organizer|feedback)
                         MOBILITY_MODULES="$MOBILITY_MODULES $m";
                         ;;
                     *)
@@ -247,7 +261,7 @@ done
 
 checkostype()
 {
-    match="darwin" 
+    match="darwin"
     if [ "$OSTYPE" = "${match}"* ]; then
         OS="darwin"
         QMKSPEC="-spec macx-g++"
@@ -272,7 +286,7 @@ findframeworks()
 
 findUniversal()
 {
-    if [ -e "mac.inc" ]; then 
+    if [ -e "mac.inc" ]; then
         rm mac.inc
     fi
     echo "contains(QT_CONFIG,x86): system(echo CONFIG+=x86 >> mac.inc)" > 2.pro
@@ -281,7 +295,7 @@ findUniversal()
     echo "contains(QT_CONFIG,x86_64): system(echo CONFIG+=x86_64 >> mac.inc)" >> 2.pro
     SOMETIME=`qmake -spec macx-g++ 2.pro 2>&1`
     rm 2.pro
-    if [ -e "mac.inc" ]; then 
+    if [ -e "mac.inc" ]; then
          echo "exists(mac.inc): include(mac.inc)" >> "$CONFIG_IN"
     fi
 }
@@ -366,6 +380,28 @@ else
 fi
 echo "QT_MOBILITY_PLUGINS = $QT_MOBILITY_PLUGINS" >> "$CONFIG_IN"
 
+#process examples path
+if [ -z "$QT_MOBILITY_EXAMPLES" ]; then
+    QT_MOBILITY_EXAMPLES="$QT_MOBILITY_PREFIX/$BIN_PATH"
+else
+    QT_MOBILITY_EXAMPLES=`absPath $QT_MOBILITY_EXAMPLES $LINUX_TARGET`
+    if [ "$?" -eq "1" ]; then
+        exit 1
+    fi
+fi
+echo "QT_MOBILITY_EXAMPLES = $QT_MOBILITY_EXAMPLES" >> "$CONFIG_IN"
+
+#process demos path
+if [ -z "$QT_MOBILITY_DEMOS" ]; then
+    QT_MOBILITY_DEMOS="$QT_MOBILITY_PREFIX/$BIN_PATH"
+else
+    QT_MOBILITY_DEMOS=`absPath $QT_MOBILITY_DEMOS $LINUX_TARGET`
+    if [ "$?" -eq "1" ]; then
+        exit 1
+    fi
+fi
+echo "QT_MOBILITY_DEMOS = $QT_MOBILITY_DEMOS" >> "$CONFIG_IN"
+
 
 echo "QT_MOBILITY_SOURCE_TREE = $relpath" >> "$QMAKE_CACHE"
 echo "QT_MOBILITY_BUILD_TREE = $shadowpath" >> "$QMAKE_CACHE"
@@ -455,7 +491,7 @@ compileTest()
     printf "."
     "$MAKE" >> "$CONFIG_LOG" 2>&1
     printf ". "
-    if ./$2 >> "$CONFIG_LOG" 2>&1; then
+    if [ -e ./$2 ]; then
         echo "OK"
         echo "$2_enabled = yes" >> "$CONFIG_IN"
     else
@@ -473,6 +509,7 @@ compileTest Immersion immersion
 compileTest "Maemo ICD" maemo-icd
 compileTest "Maemo ICD WLAN" maemo-icd-network-wlan
 compileTest "Maemo5 contacts dependencies" maemo5-contacts
+compileTest "Bluez" bluez
 if [ "$LINUX_TARGET" = maemo6 ]; then
     compileTest sensord sensord
 else
@@ -481,7 +518,7 @@ 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"
+echo "contains(mobility_modules,versit): mobility_modules *= contacts organizer" >> "$CONFIG_IN"
 echo "maemo5|maemo6:contains(maemo-icd_enabled, no): mobility_modules -= bearer" >> "$CONFIG_IN"
 
 # If libicd-network-wlan-dev.h is not present, use own copy.
@@ -524,19 +561,25 @@ for module in $MOBILITY_MODULES; do
         messaging)
             $relpath/bin/syncheaders $shadowpath/include/QtMessaging $relpath/src/messaging
             ;;
+        telephony)
+            $relpath/bin/syncheaders $shadowpath/include/QtmTelephony $relpath/src/telephony
+            ;;
         versit)
-            #versit implies contacts
+            #versit implies contacts & 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/QtSensors $relpath/src/sensors
             ;;
         feedback)
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/feedback
+            $relpath/bin/syncheaders $shadowpath/include/QtFeedback $relpath/src/feedback
+        organizer)
+            $relpath/bin/syncheaders $shadowpath/include/QtOrganizer $relpath/src/organizer
             ;;
         *)
             echo "Cannot generate headers for $module"
@@ -546,7 +589,7 @@ done
 
 mv "$CONFIG_IN" config.pri
 mkdir -p "$shadowpath/features"
-if [ "$shadowpath" != "$relpath" ]; then 
+if [ "$shadowpath" != "$relpath" ]; then
     cp -f "$relpath/features/strict_flags.prf" "$shadowpath/features"
 fi
 
@@ -558,4 +601,3 @@ else
     echo ""
     echo "configure failed."
 fi
-