From 5de69ba432d7f7f6f2b416dd1c112be2032784f1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 14 Sep 2012 17:27:00 +0200 Subject: [PATCH] Update WebKit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This updates WebKit to the latest snapshot that enables the build of WebKit2 on Windows and also drastically simplifies the build of WebKit within Qt to be built the same way as the other modules, i.e. using qmake && make Change-Id: I6e82e75ae0c3b62aff879f4339fcdce39e7f6954 Reviewed-by: Tor Arne Vestbø --- build.dependencies | 15 -------- qt.pro | 9 +---- qtwebkit | 2 +- qtwebkit.pri | 94 ---------------------------------------------- 4 files changed, 3 insertions(+), 117 deletions(-) delete mode 100644 qtwebkit.pri diff --git a/build.dependencies b/build.dependencies index a979bf03..a6990a4a 100644 --- a/build.dependencies +++ b/build.dependencies @@ -37,21 +37,6 @@ use Config; "qtwayland", ); -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", - ); -} - -%install_commands = ( - "qtwebkit" => "perl Tools/Scripts/build-webkit --qt --makeargs=\"install\"", -); - # Platform specific modules if ("$Config{osname}" =~ /linux/i) { diff --git a/qt.pro b/qt.pro index 63d31f2e..efa9a2bc 100644 --- a/qt.pro +++ b/qt.pro @@ -26,14 +26,9 @@ module_qtdeclarative.subdir = qtdeclarative module_qtdeclarative.target = module-qtdeclarative module_qtdeclarative.depends = module_qtbase module_qtjsbackend -module_qtwebkit.file = qtwebkit.pri -module_qtwebkit.makefile = Makefile.qtwebkit +module_qtwebkit.file = qtwebkit/WebKit.pro module_qtwebkit.depends = module_qtbase module_qtdeclarative -# The qtwebkit subdir does not follow the "module-*" scheme, so make our own target that does. -module_qtwebkit_target.target = module-qtwebkit -module_qtwebkit_target.commands = -module_qtwebkit_target.depends = sub-qtwebkit-pri -QMAKE_EXTRA_TARGETS += module_qtwebkit_target +module_qtwebkit.target = module-qtwebkit module_qtwebkit_examples_and_demos.subdir = qtwebkit-examples-and-demos module_qtwebkit_examples_and_demos.target = module-qtwebkit-examples-and-demos diff --git a/qtwebkit b/qtwebkit index 88a04ac0..d0424a76 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 88a04ac016f57c2d78e714682445dff2e7db4ade +Subproject commit d0424a769059c84ae20beb3c217812792ea6726b diff --git a/qtwebkit.pri b/qtwebkit.pri deleted file mode 100644 index 9f69ff0f..00000000 --- a/qtwebkit.pri +++ /dev/null @@ -1,94 +0,0 @@ -# Wrapper profile for QtWebkit. -# -# This is needed because webkit builds via a script. -# Technically this script is a .pro file, but we name it .pri to avoid clashing -# with qt.pro. - -isEmpty(vcproj) { - QMAKE_LINK = @: IGNORE THIS LINE - OBJECTS_DIR = - win32:CONFIG -= embed_manifest_exe -} else { - CONFIG += console - PHONY_DEPS = . - phony_src.input = PHONY_DEPS - phony_src.output = phony.c - phony_src.variable_out = GENERATED_SOURCES - phony_src.commands = echo int main() { return 0; } > phony.c - phony_src.name = CREATE phony.c - phony_src.CONFIG += combine - QMAKE_EXTRA_COMPILERS += phony_src -} - -DS = $$QMAKE_DIR_SEP -contains(DS, /) { - env_export = export - OPTI=+ - SBC=$$quote($$QMAKE_CHK_DIR_EXISTS qtwebkit || mkdir qtwebkit &&) -} else { - env_export = set - GNUTOOLS = $$quote("set \"PATH=$$PWD/gnuwin32/bin;%PATH%\" &&") -} - -# Any configuration making use of QMAKE_POST_LINK will not work for this project, -# since the building is done by webkit's own build script and qmake at this level -# does not know the real TARGET. Disable them here. -CONFIG -= separate_debug_info - -exists($$PWD/qtwebkit/WebKitTools):qtwebkit_tools_dir = WebKitTools -else:qtwebkit_tools_dir = Tools - -QTWEBKIT_BUILD_CONFIG = -contains(CONFIG, release):!contains(CONFIG, debug_and_release): {QTWEBKIT_BUILD_CONFIG = --release} - -# WebKit2 is not yet supported on Windows, so avoid trying to build it -# Disable WebKit2 until https://bugs.webkit.org/show_bug.cgi?id=94914 is fixed. -QTWEBKIT_BUILD_CONFIG += --no-webkit2 - -# The '+' is to make parallel "make" work across the script boundary. -module_qtwebkit.commands = $${OPTI}$${SBC}cd qtwebkit && \ - $$env_export \"WEBKITOUTPUTDIR=$$OUT_PWD/qtwebkit/WebKitBuild\" && $$GNUTOOLS \ - perl $$PWD$${DS}qtwebkit$${DS}$${qtwebkit_tools_dir}$${DS}Scripts$${DS}build-webkit \ - --qt \ - --qmake=$(QMAKE) \ - --install-libs=$$[QT_INSTALL_LIBS] \ - --qmakearg=CONFIG+=production_build \ - $$QTWEBKIT_BUILD_CONFIG -# "--makeargs=\"-$(MAKEFLAGS)\"" -# Trick to force dependency on this rule. -#module_qtwebkit.commands += $$escape_expand(\\n)make_default: module-qtwebkit -module_qtwebkit.target = module-qtwebkit - -# The '+' is to make parallel "make" work across the script boundary. -module_qtwebkit_clean.commands = $${OPTI}$${SBC}cd qtwebkit && \ - $$env_export \"WEBKITOUTPUTDIR=$$OUT_PWD/qtwebkit/WebKitBuild\" && $$GNUTOOLS \ - perl $$PWD$${DS}qtwebkit$${DS}$${qtwebkit_tools_dir}$${DS}Scripts$${DS}build-webkit \ - --qt \ - --qmake=$(QMAKE) \ - --install-libs=$$[QT_INSTALL_LIBS] \ - $$QTWEBKIT_BUILD_CONFIG \ - "--makeargs=\"$(MAKEFLAGS)\"" \ - --clean -# Trick to force dependency on this rule. -module_qtwebkit_clean.commands += $$escape_expand(\\n)clean: module-qtwebkit-clean -module_qtwebkit_clean.target = module-qtwebkit-clean - -module_qtwebkit_install.commands = $${OPTI}$${SBC}cd qtwebkit/WebKitBuild/Release && $(MAKE) install -# Trick to force dependency on this rule. -module_qtwebkit_install.commands+= $$escape_expand(\\n)install: module-qtwebkit-install -module_qtwebkit_install.target = module-qtwebkit-install - -module_qtwebkit_uninstall.commands = $${OPTI}$${SBC}cd qtwebkit && \ - $$env_export \"WEBKITOUTPUTDIR=$$OUT_PWD/qtwebkit/WebKitBuild\" && $$GNUTOOLS \ - perl $$PWD$${DS}qtwebkit$${DS}$${qtwebkit_tools_dir}$${DS}Scripts$${DS}build-webkit \ - --qt \ - --qmake=$(QMAKE) \ - --install-libs=$$[QT_INSTALL_LIBS] \ - "--makeargs=\"uninstall\"" -# Trick to force dependency on this rule. -module_qtwebkit_uninstall.commands+= $$escape_expand(\\n)uninstall: module-qtwebkit-uninstall -module_qtwebkit_uninstall.target = module-qtwebkit-uninstall - -# WebKit needs a nonstandard target because the build has to be initiated by the bundled script. -QMAKE_EXTRA_TARGETS += module_qtwebkit module_qtwebkit_clean module_qtwebkit_install module_qtwebkit_uninstall -PRE_TARGETDEPS += module-qtwebkit