From 3d86d2a8e5e3c68f9e0022e676293ddc5288c849 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Wed, 27 Oct 2010 09:54:23 +0200
Subject: Disable the ./configure -qpa [platform] flag

also fix what mkspec should be picked up when compiling on mac
---
 configure | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index da48dba..08d2f54 100755
--- a/configure
+++ b/configure
@@ -346,7 +346,7 @@ earlyArgParse()
             fi
             ;;
         qpa)
-            CFG_EMBEDDED="$VAL"
+            CFG_EMBEDDED="no"
             if [ "$PLATFORM_QPA" != "no" ]; then
                 if [ "$PLATFORM_QPA" = "maybe" ]; then
                     PLATFORM_X11=no
@@ -1333,7 +1333,7 @@ while [ "$#" -gt 0 ]; do
         fi
         ;;
     embedded-lite|qpa)
-        CFG_EMBEDDED="$VAL"
+        CFG_EMBEDDED="no"
         if [ "$PLATFORM_QPA" != "no" ]; then
             if [ "$PLATFORM_QPA" = "maybe" ]; then
                 PLATFORM_X11=no
@@ -2622,7 +2622,6 @@ fi ### help
 #-------------------------------------------------------------------------------
 
 [ "$PLATFORM_QWS" = "yes" -a "$CFG_EMBEDDED" = "no" ] && CFG_EMBEDDED=auto
-[ "$PLATFORM_QPA" = "yes" -a "$CFG_EMBEDDED" = "no" ] && CFG_EMBEDDED=auto
 if [ "$CFG_EMBEDDED" != "no" ]; then
     case "$UNAME_SYSTEM:$UNAME_RELEASE" in
     Darwin:*)
@@ -2705,7 +2704,7 @@ if [ -z "$PLATFORM" ]; then
     PLATFORM_NOTES=
     case "$UNAME_SYSTEM:$UNAME_RELEASE" in
      Darwin:*)
-        if [ "$PLATFORM_MAC" = "yes" ]; then
+        if [ "$PLATFORM_MAC" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then
           PLATFORM=macx-g++
         # PLATFORM=macx-xcode
         else
@@ -6957,7 +6956,6 @@ if [ "$PLATFORM_QWS" = "yes" ]; then
     rm -f "src/.moc/$QMAKE_OUTDIR/allmoc.cpp" # needs remaking if config changes
 fi
 if [ "$PLATFORM_QPA" = "yes" ]; then
-    QMAKE_OUTDIR="${QMAKE_OUTDIR}-emb-$CFG_EMBEDDED"
     QMAKE_CONFIG="$QMAKE_CONFIG qpa"
     QT_CONFIG="$QT_CONFIG qpa"
     rm -f "src/.moc/$QMAKE_OUTDIR/allmoc.cpp" # needs remaking if config changes
-- 
cgit v0.12