summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2012-03-29 05:59:44 -0500
committerQt by Nokia <qt-info@nokia.com>2012-04-05 04:35:38 +0200
commit6ab6bd8ff70e24948acc4517ed4b1d4ed2a567e4 (patch)
treeeb246725c25dabd561e16b1f14221ab5e8c7b5fb
parente4ed3288e99880f528b96ae2ec192ba91f22f70a (diff)
Avoid building webkit by default on Windows for now
WebKit still doesn't compile cleanly on Windows, so avoid it until we have something which works. Change-Id: I468dfbd01741705cd0bba3b035855d46acbb42e9 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
-rw-r--r--build.dependencies1
1 files changed, 1 insertions, 0 deletions
diff --git a/build.dependencies b/build.dependencies
index a8e96f33..ab4ad911 100644
--- a/build.dependencies
+++ b/build.dependencies
@@ -44,6 +44,7 @@ if ("$Config{osname}" =~ /mswin/i) {
%build_commands = (
"qtwebkit" => "perl Tools/Scripts/build-webkit --qt --no-netscape-plugin --no-webkit2",
);
+ push @nondefault_modules, ("qtwebkit", "qtwebkit-examples-and-demos");
} else {
%build_commands = (
"qtwebkit" => "perl Tools/Scripts/build-webkit --qt --release --no-netscape-plugin",