summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-01-13 15:42:05 +0100
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-01-13 15:43:06 +0100
commitdf13c30d05ac65649093a1fc7fda8215e27a8d69 (patch)
tree44f9f23d3958ea7c5ad534a7c1118f2b4e47884a /bin
parentf68fdabde03c9033dfd3821f7bd4f91c3afc48a4 (diff)
qt5_tool: Do not add xcb' to configure on Mac.
Change-Id: Ibac8d1c58f7270fa224e440670d0f87429c247d8 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/qt5_tool2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/qt5_tool b/bin/qt5_tool
index f1a6ae5..fa2b328 100755
--- a/bin/qt5_tool
+++ b/bin/qt5_tool
@@ -786,7 +786,7 @@ if ( $BUILD != 0 ) {
}
push (@configureArguments, '-nomake', 'tests', '-nomake', 'examples');
# -- detect X11
- push (@configureArguments, '-xcb') if defined $ENV{'DISPLAY'};
+ push (@configureArguments, '-xcb') if $os == $OS_LINUX && defined $ENV{'DISPLAY'};
my $configureArgumentsFromConfig = readQt5ToolConfig('configureArguments');
push(@configureArguments, split(/ /, $configureArgumentsFromConfig)) unless $configureArgumentsFromConfig eq '';
# --- Shadow builds: Remove and re-create directory