Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)

New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream

1 files changed, 30 insertions, 5 deletions

diff --git a/WebKit.pro b/WebKit.pro
index ef25ea511..f43dcac9e 100644
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -5,11 +5,36 @@
 # See 'Tools/qmake/README' for an overview of the build system
 # -------------------------------------------------------------------
 
-haveQt(4) {
-    QMAKEPATH = $$(QMAKEPATH)
-    isEmpty(QMAKEPATH)|!exists($${QMAKEPATH}/mkspecs) {
-        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
+!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))
     }
 }