summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2016-06-24 20:10:50 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2016-06-27 16:28:01 +0000
commit6d616dc6e4e8d4463a4d75d3b88a2e8ed21c25e5 (patch)
tree4396180662bdb8aae857ad4561a6d7a39fc07baf
parent8170aa5b2fc877bc1303b4fc6509421bd69db829 (diff)
downloadqtwebkit-6d616dc6e4e8d4463a4d75d3b88a2e8ed21c25e5.tar.gz
Allow making production builds with build-webkit.
Don't add CONFIG-=production_build if CONFIG+=production_build was passed in arguments. Change-Id: If401b3a8c1391c71273401257e85274e8db8e2b2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-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";