summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMorten Sorvig <morten.sorvig@nokia.com>2011-08-09 13:40:15 +0200
committerMorten Johan Sørvig <morten.sorvig@nokia.com>2011-08-11 13:17:15 +0200
commit9ff59c4ef435b41721a37dd9236473df51dc2e83 (patch)
tree4f6b19f218bc9ce69f3f60241de577e28610558a /configure
parent845291ba19f106c7e5e54bd4444f09a83d01f31c (diff)
Configure: Make QPA default when building on OS X
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>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 1 insertions, 3 deletions
diff --git a/configure b/configure
index be744d3990..36080b3e70 100755
--- 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
#-----------------------------------------------------------------------------