Remove Mac/QPA collision breaking library linkage
authorDonald Carr <donald.carr@nokia.com>
Thu, 23 Feb 2012 21:07:42 +0000 (21:07 +0000)
committerQt by Nokia <qt-info@nokia.com>
Wed, 29 Feb 2012 11:24:36 +0000 (12:24 +0100)
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>
configure

index 4e6d42d..c5ce932 100755 (executable)
--- 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)