summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2012-12-20 14:13:40 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-14 22:04:31 +0100
commitc174d101bddb63758ae604840e2852759089d57c (patch)
treec7cc1c2588cca9b13d02e947464831ad389e2c97 /configure
parent67195dc394001ee1c9adc7db97fd6ff9d88e9b0c (diff)
configure: disable GTK auto-detection on Mac
Task-number: QTBUG-28769 Change-Id: I2f05fdf530cde8ae7ed1470a99acade6267e19e6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 5 insertions, 0 deletions
diff --git a/configure b/configure
index ea6711de4f..db1a12e619 100755
--- a/configure
+++ b/configure
@@ -2623,6 +2623,11 @@ else
CFG_FRAMEWORK=no
fi
+# disable GTK style support auto-detection on Mac
+if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then
+ CFG_QGTKSTYLE=no
+fi
+
QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`
TEST_COMPILER=$QMAKE_CONF_COMPILER