From 46a7dee5ba42a8075e6597b4df25cb2a54632dad Mon Sep 17 00:00:00 2001
From: Jan Arve Saether <jan-arve.saether@digia.com>
Date: Mon, 13 May 2013 14:47:51 +0200
Subject: [PATCH] Fix bug when skipping webkit on windows
Do not add "-skip qtwebkit" as one single item to the array, since that
will effectively run configure like this:
.\configure.exe "-skip qtwebkit"
This gave the error:
Unknown option -skip qtwebkit
This was found to be a problem with Windows Powershell, not sure if this
is a problem under command.com
Change-Id: Id2a2e8d4705fc46905450e6a7ac503d6c27710aa
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
bin/qt5_tool | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/bin/qt5_tool b/bin/qt5_tool
index 72996b7..5e734ac 100755
--- a/bin/qt5_tool
+++ b/bin/qt5_tool
@@ -838,7 +838,10 @@ if ( $BUILD != 0 ) {
my @configureArguments;
my $configureArgumentsFromConfig = readQt5ToolConfig('configureArguments');
push(@configureArguments, split(/ /, $configureArgumentsFromConfig)) unless $configureArgumentsFromConfig eq '';
- push(@configureArguments, "-skip qtwebkit") if not $BUILD_WEBKIT;
+ if (!$BUILD_WEBKIT) {
+ push(@configureArguments, "-skip");
+ push(@configureArguments, "qtwebkit");
+ }
$makeInstallRequired = grep(/^-prefix$/, @configureArguments);
# --- Shadow builds: Remove and re-create directory
my $shadowBuildDir = shadowBuildFolder();
--
GitLab