Configure: Make QPA default when building on OS X
authorMorten Sorvig <morten.sorvig@nokia.com>
Tue, 9 Aug 2011 11:40:15 +0000 (13:40 +0200)
committerMorten Johan Sørvig <morten.sorvig@nokia.com>
Thu, 11 Aug 2011 11:17:15 +0000 (13:17 +0200)
Minimal patch to change the default. PLATFORM_MAC
is now obsolete, and at some point we need to go
through configure and remove it or replace usages
with for example BULD_ON_MAC.

Change-Id: Ic6a8609158b6021ead23d8731e683ef3a51cc4d7
Reviewed-on: http://codereview.qt.nokia.com/2780
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
configure

index be744d3..36080b3 100755 (executable)
--- a/configure
+++ b/configure
@@ -188,11 +188,9 @@ PLATFORM_X11=no
 PLATFORM_QWS=no
 PLATFORM_QPA=yes
 BUILD_ON_MAC=no
+PLATFORM_MAC=no
 if [ -d /System/Library/Frameworks/Carbon.framework ]; then
-    PLATFORM_MAC=maybe
     BUILD_ON_MAC=yes
-else
-    PLATFORM_MAC=no
 fi
 
 #-----------------------------------------------------------------------------