Modified: trunk/ChangeLog (124607 => 124608)
--- trunk/ChangeLog 2012-08-03 14:10:27 UTC (rev 124607)
+++ trunk/ChangeLog 2012-08-03 14:11:03 UTC (rev 124608)
@@ -1,3 +1,16 @@
+2012-08-03 Oswald Buddenhagen <[email protected]>
+
+ [Qt] Populate .qmake.cache from the top-level project file
+
+ This makes it possible to build webkit without using the perl build
+ script. The duplicated logic in build-webkit will be removed when we
+ remove the Qt4 code paths. The build-webkit script will then simply
+ call 'qmake WebKit.pro' from WEBKITOUTPUTDIR.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * WebKit.pro:
+
2012-08-03 Dominik Röttsches <[email protected]>
[cmake] Cleanup FindHarfBuzz.cmake
Modified: trunk/Tools/ChangeLog (124607 => 124608)
--- trunk/Tools/ChangeLog 2012-08-03 14:10:27 UTC (rev 124607)
+++ trunk/Tools/ChangeLog 2012-08-03 14:11:03 UTC (rev 124608)
@@ -1,5 +1,18 @@
2012-08-03 Oswald Buddenhagen <[email protected]>
+ [Qt] Populate .qmake.cache from the top-level project file
+
+ This makes it possible to build webkit without using the perl build
+ script. The duplicated logic in build-webkit will be removed when we
+ remove the Qt4 code paths. The build-webkit script will then simply
+ call 'qmake WebKit.pro' from WEBKITOUTPUTDIR.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * qmake/mkspecs/features/win32/default_pre.prf:
+
+2012-08-03 Oswald Buddenhagen <[email protected]>
+
[Qt] Move build config default to build-webkit instead of default_pre
Allows the qmake buildsystem have its own default.
Modified: trunk/Tools/qmake/mkspecs/features/win32/default_pre.prf (124607 => 124608)
--- trunk/Tools/qmake/mkspecs/features/win32/default_pre.prf 2012-08-03 14:10:27 UTC (rev 124607)
+++ trunk/Tools/qmake/mkspecs/features/win32/default_pre.prf 2012-08-03 14:11:03 UTC (rev 124608)
@@ -7,3 +7,6 @@
load(default_pre)
debug: CONFIG += use_all_in_one_files
+
+# WebKit2 not supported on Windows yet
+CONFIG += no_webkit2
Modified: trunk/WebKit.pro (124607 => 124608)
--- trunk/WebKit.pro 2012-08-03 14:10:27 UTC (rev 124607)
+++ trunk/WebKit.pro 2012-08-03 14:11:03 UTC (rev 124608)
@@ -11,6 +11,38 @@
error("The environment variable QMAKEPATH needs to point to $WEBKITSRC/Tools/qmake")
# Otherwise we won't pick up the feature prf files needed for the build
}
+} else:!webkit_configured {
+ CONFIG += webkit_configured
+ CONFIG += production_build
+ include(Tools/qmake/configure.pri)
+ the_config = $$CONFIG
+ the_config -= $$BASE_CONFIG $$find(CONFIG, "^(done_)?config_")
+ cache(CONFIG, add, the_config)
+ the_defines = $$DEFINES
+ the_defines -= $$BASE_DEFINES
+ cache(DEFINES, add, the_defines)
+
+ # We inherit the build type from Qt, unless it was specified on the qmake command
+ # line. Note that the perl build script defaults to forcing a release build.
+ contains(the_config, debug|release) {
+ contains(the_config, debug) {
+ contains(the_config, release) {
+ !debug_and_release:cache(CONFIG, add, $$list(debug_and_release))
+ } else {
+ release:cache(CONFIG, del, $$list(release))
+ debug_and_release:cache(CONFIG, del, $$list(debug_and_release))
+ }
+ } else { # release
+ debug:cache(CONFIG, del, $$list(debug))
+ debug_and_release:cache(CONFIG, del, $$list(debug_and_release))
+ }
+ } else {
+ contains(QT_CONFIG, release, debug|release): \
+ cache(CONFIG, add, $$list(release))
+ else: \
+ cache(CONFIG, add, $$list(debug))
+ macx:!debug_and_release:cache(CONFIG, add, $$list(debug_and_release))
+ }
}
TEMPLATE = subdirs
