summaryrefslogtreecommitdiff
path: root/Tools/Scripts
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-08-01 11:09:57 +0200
committerLiang Qi <liang.qi@qt.io>2016-08-01 11:10:05 +0200
commitd9ca6bcb08d9560e91a1ca1fe4542c26791b26c1 (patch)
treead7d8724aa61c72547a0a85a4d460a7d3bf30be9 /Tools/Scripts
parentb20434396179754b292fd4a9164c2b3e338129a1 (diff)
parentf010d89fa2e4aa463d3392c5f37fa22efd48e04e (diff)
downloadqtwebkit-d9ca6bcb08d9560e91a1ca1fe4542c26791b26c1.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I7ef71d5a3af2acb9e41fffd9a215980dbace9d90
Diffstat (limited to 'Tools/Scripts')
-rwxr-xr-xTools/Scripts/webkitdirs.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index cc30b16f5..1eeabfe9d 100755
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -2231,7 +2231,7 @@ sub buildQMakeProjects
}
# Using build-webkit to build assumes you want a developer-build
- push @buildArgs, "CONFIG-=production_build";
+ push @buildArgs, "CONFIG-=production_build" unless grep { $_ eq "CONFIG+=production_build" } @buildArgs;
my $svnRevision = currentSVNRevision();
my $previousSvnRevision = "unknown";