diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-03-21 08:16:51 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-22 12:56:06 +0100 |
| commit | ecf6aa2dca87446a74bef3a13b963a1fd5e0d6d0 (patch) | |
| tree | 8e29a6bd6e3f713ec7c66941e763612d6b4f3b06 /configure | |
| parent | a30676f20171f2bf7a8074b21be2688fcc239b14 (diff) | |
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 <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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` |