From 6ccb808ef6dc81c2e421c352545c6932a8dbaad6 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 20 Sep 2012 14:02:45 +0200 Subject: WebKit update This should fix the build errors that "looked" like errors from Qt3D but were triggered through an incorrect QtWebKit module master header file, as well as the supposed linking errors related to WebKit2. Also disable the WebKit build if ICU is not available instead of breaking the build when reaching WebKit. Change-Id: I109b4152c081250c8950ef62dd7278129b716f76 Reviewed-by: Simon Hausmann --- qt.pro | 13 +++++++++---- qtwebkit | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/qt.pro b/qt.pro index efa9a2bc..86aec5f8 100644 --- a/qt.pro +++ b/qt.pro @@ -172,15 +172,20 @@ exists(qtactiveqt/qtactiveqt.pro) { module_qttools.depends += module_qtactiveqt } exists(qtwebkit/WebKit.pro) { - SUBDIRS += module_qtwebkit - module_qttools.depends += module_qtwebkit + mac|contains(QT_CONFIG, icu) { + SUBDIRS += module_qtwebkit + module_qttools.depends += module_qtwebkit + exists(qtwebkit-examples-and-demos/qtwebkit-examples-and-demos.pro) { + SUBDIRS += module_qtwebkit_examples_and_demos + } + } else { + message("WebKit: Qt was built without ICU support, WebKit disabled.") + } } exists(qttools/qttools.pro) { SUBDIRS += module_qttools module_qtquick1.depends += module_qttools } -exists(qtwebkit/WebKit.pro):exists(qtwebkit-examples-and-demos/qtwebkit-examples-and-demos.pro): \ - SUBDIRS += module_qtwebkit_examples_and_demos exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1 !win32:!mac:exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats diff --git a/qtwebkit b/qtwebkit index 6bbb7fbb..02e1fbbe 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2 +Subproject commit 02e1fbbefd49229b102ef107bd70ce974a2d85fb -- cgit v1.2.3