diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-11 19:54:20 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-09-11 19:54:20 +0200 |
commit | 88a04ac016f57c2d78e714682445dff2e7db4ade (patch) | |
tree | a48ca81ee3b29953121308168db22532d5b57fe2 /WebKit.pro | |
parent | 284837daa07b29d6a63a748544a90b1f5842ac5c (diff) |
Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c (http://svn.webkit.org/repository/webkit/trunk@128206)
This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection
and allow for further simplifications in the future
Diffstat (limited to 'WebKit.pro')
-rw-r--r-- | WebKit.pro | 41 |
1 files changed, 5 insertions, 36 deletions
diff --git a/WebKit.pro b/WebKit.pro index a0a1e5f1b..cc18ce2eb 100644 --- a/WebKit.pro +++ b/WebKit.pro @@ -5,39 +5,6 @@ # See 'Tools/qmake/README' for an overview of the build system # ------------------------------------------------------------------- -!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 CONFIG += ordered @@ -49,7 +16,7 @@ JavaScriptCore.file = Source/JavaScriptCore/JavaScriptCore.pro JavaScriptCore.makefile = Makefile.JavaScriptCore SUBDIRS += JavaScriptCore -contains(DEFINES, WTF_USE_3D_GRAPHICS=1) { +use?(3D_GRAPHICS) { ANGLE.file = Source/ThirdParty/ANGLE/ANGLE.pro ANGLE.makefile = Makefile.ANGLE SUBDIRS += ANGLE @@ -59,13 +26,13 @@ WebCore.file = Source/WebCore/WebCore.pro WebCore.makefile = Makefile.WebCore SUBDIRS += WebCore -!no_webkit1 { +build?(webkit1) { webkit1.file = Source/WebKit/WebKit1.pro webkit1.makefile = Makefile.WebKit1 SUBDIRS += webkit1 } -!no_webkit2 { +build?(webkit2) { webkit2.file = Source/WebKit2/WebKit2.pro webkit2.makefile = Makefile.WebKit2 SUBDIRS += webkit2 @@ -75,4 +42,6 @@ QtWebKit.file = Source/QtWebKit.pro QtWebKit.makefile = Makefile.QtWebKit SUBDIRS += QtWebKit +Tools.file = Tools/Tools.pro +Tools.makefile = Makefile.Tools SUBDIRS += Tools |