From: Donald Carr <donald.carr@nokia.com>
Date: Thu, 23 Feb 2012 21:07:42 +0000 (+0000)
Subject: Remove Mac/QPA collision breaking library linkage
X-Git-Tag: qt-v5.0.0-alpha1~678
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8dfc86e0d6391a9e923557732a3ddc6c37d98b89;p=profile%2Fivi%2Fqtbase.git

Remove Mac/QPA collision breaking library linkage

Prior to this change, explicitly passing -qpa to configure breaks compilation on Mac. This is due to a false dichotomy between MAC/QPA

Change-Id: I52cacf96ae8d8d203787f9bbade417f2c55ab3f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
---

diff --git a/configure b/configure
index 4e6d42d..c5ce932 100755
--- a/configure
+++ b/configure
@@ -359,7 +359,6 @@ earlyArgParse()
             if [ "$PLATFORM_QPA" != "no" ]; then
                 if [ "$PLATFORM_QPA" = "maybe" ]; then
                     PLATFORM_X11=no
-                    PLATFORM_MAC=no
                     PLATFORM_QPA=yes
                 fi
             else
@@ -1222,7 +1221,6 @@ while [ "$#" -gt 0 ]; do
         ;;
     embedded-lite|qpa)
         PLATFORM_X11=no
-        PLATFORM_MAC=no
         PLATFORM_QPA=yes
         ;;
     sse)