summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-10-22 08:29:01 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-10-22 13:34:56 +0000
commit330755382a0746383b57e524be288f362b4d29ea (patch)
tree14440d5c702c8299e24bdb0bba14cd0f165056c5 /bin
parent854c5377227f1543ec55231811e02a073e6ae1a6 (diff)
qt5_tool: Use / +/ when splitting lists.
Repetitive white space in configure argument lists will then no longer cause errors. Change-Id: I747c410106dddc9d4161464e06332f9c24649620 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/qt5_tool4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/qt5_tool b/bin/qt5_tool
index 6abd2f4..19a4d70 100755
--- a/bin/qt5_tool
+++ b/bin/qt5_tool
@@ -840,11 +840,11 @@ if ( $BUILD != 0 ) {
winRemoveGitFromPath() if $minGW;
my @configureArguments;
my $configureArgumentsFromConfig = readQt5ToolConfig('configureArguments');
- push(@configureArguments, split(/ /, $configureArgumentsFromConfig)) unless $configureArgumentsFromConfig eq '';
+ push(@configureArguments, split(/ +/, $configureArgumentsFromConfig)) unless $configureArgumentsFromConfig eq '';
my $skippedModules = readQt5ToolConfig('skip');
my @skipList;
push(@skipList, 'qtwebkit') if !$BUILD_WEBKIT;
- push(@skipList, split(/ /, readQt5ToolConfig('skip')));
+ push(@skipList, split(/ +/, readQt5ToolConfig('skip')));
foreach my $skippedModule (@skipList) {
if (-d File::Spec->catfile($rootDir, $skippedModule)) {
push(@configureArguments, '-skip', $skippedModule);