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

Conflicts:
	configure.bat
	doc/html/annotated.html
	doc/html/cameracapture-cameracapture-cpp.html
	doc/html/cameracapture-cameracapture-h.html
	doc/html/cameracapture-cameracapture-pro.html
	doc/html/cameracapture-main-cpp.html
	doc/html/cameracapture-settings-cpp.html
	doc/html/cameracapture-settings-h.html
	doc/html/cameracapture.html
	doc/html/classes.html
	doc/html/declarative-declarative-pro.html
	doc/html/declarative-demo-demo-pro.html
	doc/html/declarative-landlinedialer-landlinedialer-cpp.html
	doc/html/declarative-landlinedialer-landlinedialer-h.html
	doc/html/declarative-landlinedialer-landlinedialer-pro.html
	doc/html/declarative-landlinedialer-landlinedialerplugin-cpp.html
	doc/html/declarative-landlinedialer-landlinedialerplugin-h.html
	doc/html/declarative-main-cpp.html
	doc/html/declarative-sfwexample-cpp.html
	doc/html/declarative-sfwexample-h.html
	doc/html/declarative-voipdialer-voipdialer-cpp.html
	doc/html/declarative-voipdialer-voipdialer-h.html
	doc/html/declarative-voipdialer-voipdialer-pro.html
	doc/html/declarative-voipdialer-voipdialerplugin-cpp.html
	doc/html/declarative-voipdialer-voipdialerplugin-h.html
	doc/html/functions.html
	doc/html/future.html
	doc/html/preview.html
	doc/html/qcamera-members.html
	doc/html/qcamera.html
	doc/html/qcameracontrol-members.html
	doc/html/qcameracontrol.html
	doc/html/qcameraexposurecontrol-members.html
	doc/html/qcameraexposurecontrol.html
	doc/html/qcamerafocuscontrol-members.html
	doc/html/qcamerafocuscontrol.html
	doc/html/qcontactdetaildefinition-obsolete.html
	doc/html/qcontactdetailfielddefinition-obsolete.html
	doc/html/qcontactmanager.html
	doc/html/qcontactrelationship-obsolete.html
	doc/html/qimagecapturecontrol-members.html
	doc/html/qimagecapturecontrol.html
	doc/html/qimageprocessingcontrol-members.html
	doc/html/qimageprocessingcontrol.html
	doc/html/qml-audio.html
	doc/html/qml-qsoundeffect.html
	doc/html/qml-video.html
	doc/html/qstillimagecapture-members.html
	doc/html/qstillimagecapture.html
	doc/html/qt-mobility-project-library.index
	doc/html/qtmobility.qhp
	doc/html/qversitreader.html
	doc/html/sensors-api.html
	doc/html/streamplayer-main-cpp.html
	doc/html/streamplayer-streamplayer-cpp.html
	doc/html/streamplayer-streamplayer-h.html
	doc/html/streamplayer-streamplayer-pro.html
	doc/html/streamplayer.html

1 files changed, 25 insertions, 3 deletions

diff --git a/configure b/configure
index 218967ca81..a8b75dfff0 100755
--- a/configure
+++ b/configure
@@ -209,10 +209,29 @@ findframeworks()
 
 findframeworks
 
+findUniversal()
+{
+    if [ -e "mac.inc" ]; then 
+        rm mac.inc
+    fi
+    echo "contains(QT_CONFIG,x86): system(echo CONFIG+=x86 >> mac.inc)" > 2.pro
+    echo "contains(QT_CONFIG,ppc): system(echo CONFIG+=ppc >> mac.inc)" >> 2.pro
+    echo "contains(QT_CONFIG,ppc64): system(echo CONFIG+=ppc64 >> mac.inc)" >> 2.pro
+    echo "contains(QT_CONFIG,x86_64): system(echo CONFIG+=x86_64 >> mac.inc)" >> 2.pro
+    SOMETIME=`qmake 2.pro 2>&1`
+    rm 2.pro
+    if [ -e "mac.inc" ]; then 
+         echo "exists(mac.inc): include(mac.inc)" >> "$CONFIG_IN"
+    fi
+}
+
+
 if [ -n "$BUILD_SILENT" ]; then
     echo "CONFIG += silent"  > "$CONFIG_IN"
 fi
 
+findUniversal
+
 if [ -z "$RELEASEMODE" ]; then
     RELEASEMODE="debug"
 fi
@@ -348,7 +367,7 @@ compileTest()
         cd config.tests/$2
     fi
 
-    qmake "$relpath/config.tests/$2/$2.pro" >> "$CONFIG_LOG"
+    qmake "$relpath/config.tests/$2/$2.pro" 2>> "$CONFIG_LOG" >> "$CONFIG_LOG"
     printf  " ."
     "$MAKE" clean >> "$CONFIG_LOG"
     printf "."
@@ -368,6 +387,7 @@ compileTest()
 compileTest QMF qmf
 compileTest NetworkManager networkmanager
 compileTest "CoreWLAN (MacOS 10.6)" corewlan
+compileTest "Maemo ICD" maemo-icd
 
 # Now module selection
 # using 'expr match ....' should help a bit
@@ -379,6 +399,7 @@ compileTest "CoreWLAN (MacOS 10.6)" corewlan
 # 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 "maemo5|maemo6:contains(maemo-icd_enabled, no): mobility_modules -= bearer" >> "$CONFIG_IN"
 
 # Ideally we'd skip generating headers for modules that are not enabled
 echo "Generating Mobility Headers..."
@@ -410,7 +431,6 @@ for module in $MOBILITY_MODULES; do
             ;;
         multimedia)
             $relpath/bin/syncheaders $shadowpath/include $relpath/src/multimedia
-            $relpath/bin/syncheaders $shadowpath/include $relpath/src/multimedia/experimental
             ;;
         messaging)
             $relpath/bin/syncheaders $shadowpath/include $relpath/src/messaging
@@ -437,7 +457,9 @@ done
 
 mv "$CONFIG_IN" config.pri
 mkdir -p "$shadowpath/features"
-cp -f "$relpath/features/strict_flags.prf" "$shadowpath/features"
+if [ "$shadowpath" != "$relpath" ]; then 
+    cp -f "$relpath/features/strict_flags.prf" "$shadowpath/features"
+fi
 
 echo "Running qmake..."
 if qmake -recursive "$relpath/qtmobility.pro"; then