From ecf6aa2dca87446a74bef3a13b963a1fd5e0d6d0 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 21 Mar 2014 08:16:51 +0100 Subject: configure: Disable XCB auto-detection on Mac Users might have (old) libxcb installed on OS X, for instance as a dependency for another package installed via MacPorts. It's still very unlikely that any Mac user would want to use the XCB platform plugin. Thus, disable the auto-detection to avoid a dubious XCB configuration error on Mac. Change-Id: I11d21aad255925883d6841444baa13a29f1a26b0 Reviewed-by: Thiago Macieira Reviewed-by: Oswald Buddenhagen Reviewed-by: Gatis Paeglis --- configure | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 80958ea4c0..96273193a6 100755 --- a/configure +++ b/configure @@ -3372,9 +3372,10 @@ if [ "$XPLATFORM_IOS" = "yes" ]; then fi fi -# disable GTK style support auto-detection on Mac -if [ "$XPLATFORM_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then - CFG_QGTKSTYLE=no +# disable XCB and GTK support auto-detection on Mac +if [ "$XPLATFORM_MAC" = "yes" ]; then + [ "$CFG_XCB" = "auto" ] && CFG_XCB=no + [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no fi QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` -- cgit v1.2.3