fix mobility deployment problem on mac.

1 files changed, 47 insertions, 29 deletions

diff --git a/configure b/configure
index 7f7aa69dff..9b16e609ac 100755
--- a/configure
+++ b/configure
@@ -111,6 +111,7 @@ QMKSPEC=
 OS="other"
 # By default, all modules are requested.  Reset this later if -modules is supplied
 ORGANIZER_REQUESTED=yes
+MAC_DEPLOY=
 
 usage() 
 {
@@ -164,6 +165,8 @@ usage()
 #    echo "-staticconfig <name>"
 #    echo "                    Avoids running of configuration tests. The default"
 #    echo "                    values are sourced from features/platformconfig/<name>.pri"
+    echo "-mac-deploy ....    Use this option for deploying QtMobility into Qt for use with macdeployqt tool"
+    echo "                    This overrides any -prefix that may be set."
     echo
     
     rm -f "$CONFIG_IN"
@@ -288,6 +291,10 @@ while [ "$#" -gt 0 ]; do
             LANGUAGES=$2
             shift
             ;;
+        -mac-deploy)
+            MAC_DEPLOY='yes'
+            shift
+            ;;
         *)
             echo "Unknown option: $1"
             usage
@@ -296,6 +303,16 @@ while [ "$#" -gt 0 ]; do
     shift
 done
 
+if [ -z "$RELEASEMODE" ]; then
+    RELEASEMODE="debug"
+fi
+echo "CONFIG += $RELEASEMODE" > "$CONFIG_IN"
+
+
+if [ -n "$BUILD_SILENT" ]; then
+    echo "CONFIG += silent"  >> "$CONFIG_IN"
+fi
+
 checkostype()
 {
     match="Darwin"
@@ -306,20 +323,7 @@ checkostype()
     fi
 }
 
-findframeworks()
-{
-# figure out if Qt was built with frameworks
-# if so, install in the correct place.
-# and fix rpath
-    echo "contains(QT_CONFIG,qt_framework):message(1)" > 1.pro
-    SOMETHING=`$QMAKE_EXEC -spec macx-g++ 1.pro 2>&1`
-        if [ "$SOMETHING" = "Project MESSAGE: 1" ]; then
-            LIB_PATH="Library/Frameworks"
-            BIN_PATH="Applications"
-        fi
-    rm 1.pro
-}
-
+checkostype
 
 findUniversal()
 {
@@ -337,24 +341,10 @@ findUniversal()
     fi
 }
 
-checkostype
-
-if [ "$OS" = "darwin" ] ; then
-    findframeworks
-fi
-
-if [ -n "$BUILD_SILENT" ]; then
-    echo "CONFIG += silent"  > "$CONFIG_IN"
-fi
-
 if [ "$OS" = "darwin" ] ; then
     findUniversal
 fi
 
-if [ -z "$RELEASEMODE" ]; then
-    RELEASEMODE="debug"
-fi
-echo "CONFIG += $RELEASEMODE" >> "$CONFIG_IN"
 
 #do we build for Maemo?
 if [ -n "$LINUX_TARGET" ]; then
@@ -367,6 +357,25 @@ if [ -n "$LINUX_TARGET" ]; then
     fi
 fi
 
+
+if [ -n "$MAC_DEPLOY" ]; then
+    QT_MOBILITY_PREFIX=`$QMAKE_EXEC -query QT_INSTALL_PREFIX`
+    echo "QT_MOBILITY_PREFIX = $QT_MOBILITY_PREFIX" >> "$CONFIG_IN"
+    QT_MOBILITY_INCLUDE=`$QMAKE_EXEC -query QT_INSTALL_HEADERS`
+    echo "QT_MOBILITY_INCLUDE = $QT_MOBILITY_INCLUDE" >> "$CONFIG_IN"
+    QT_MOBILITY_LIB=`$QMAKE_EXEC -query QT_INSTALL_LIBS`
+    echo "QT_MOBILITY_LIB = $QT_MOBILITY_LIB" >> "$CONFIG_IN"
+    QT_MOBILITY_BIN=`$QMAKE_EXEC -query QT_INSTALL_BINS`
+    echo "QT_MOBILITY_BIN = $QT_MOBILITY_BIN" >> "$CONFIG_IN"
+    QT_MOBILITY_PLUGINS=`$QMAKE_EXEC -query QT_INSTALL_PLUGINS`
+    echo "QT_MOBILITY_PLUGINS = $QT_MOBILITY_PLUGINS" >> "$CONFIG_IN"
+    QT_MOBILITY_EXAMPLES=`$QMAKE_EXEC -query QT_INSTALL_EXAMPLES`
+    echo "QT_MOBILITY_EXAMPLES = $QT_MOBILITY_EXAMPLES" >> "$CONFIG_IN"
+    QT_MOBILITY_DEMOS=`$QMAKE_EXEC -query QT_INSTALL_DEMOS`
+    echo "QT_MOBILITY_DEMOS = $QT_MOBILITY_DEMOS" >> "$CONFIG_IN"
+
+else
+
 #process PREFIX
 QT_MOBILITY_PREFIX=`absPath $QT_MOBILITY_PREFIX $LINUX_TARGET`
 if [ "$?" -eq "1" ]; then
@@ -440,7 +449,7 @@ else
     fi
 fi
 echo "QT_MOBILITY_DEMOS = $QT_MOBILITY_DEMOS" >> "$CONFIG_IN"
-
+fi
 
 echo "QT_MOBILITY_SOURCE_TREE = $relpath" >> "$QMAKE_CACHE"
 echo "QT_MOBILITY_BUILD_TREE = $shadowpath" >> "$QMAKE_CACHE"
@@ -720,6 +729,15 @@ echo "Running $QMAKE_EXEC..."
 if $QMAKE_EXEC -makefile $QMKSPEC -recursive "$relpath/qtmobility.pro"; then
     echo ""
     echo "configure has finished. You may run make or gmake to build the project now."
+    echo ""
+    echo "QT_MOBILITY_PREFIX = $QT_MOBILITY_PREFIX"
+    echo "QT_MOBILITY_INCLUDE = $QT_MOBILITY_INCLUDE"
+    echo "QT_MOBILITY_LIB = $QT_MOBILITY_LIB"
+    echo "QT_MOBILITY_BIN = $QT_MOBILITY_BIN"
+    echo "QT_MOBILITY_PLUGINS = $QT_MOBILITY_PLUGINS"
+    echo "QT_MOBILITY_EXAMPLES = $QT_MOBILITY_EXAMPLES"
+    echo "QT_MOBILITY_DEMOS = $QT_MOBILITY_DEMOS"
+
 else
     echo ""
     echo "configure failed."