summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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