summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-09-20 14:02:45 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-21 16:45:16 +0200
commit6ccb808ef6dc81c2e421c352545c6932a8dbaad6 (patch)
treee41d7c2ad4cf884dcf5280b62f52eec06abdebe5
parentc0626490d1364187c4b4181cfd110640e3897ba2 (diff)
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 <simon.hausmann@digia.com>
-rw-r--r--qt.pro13
m---------qtwebkit0
2 files changed, 9 insertions, 4 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
-Subproject 6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb
+Subproject 02e1fbbefd49229b102ef107bd70ce974a2d85f