lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

WebKit update

Browse Source 
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>
This commit is contained in:
Simon Hausmann
2012-09-20 14:02:45 +02:00
committed by The Qt Project
parent c0626490d1
commit 6ccb808ef6
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
qt.pro
View File

@@ -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

2
qtwebkit

Submodule qtwebkit updated: 6bbb7fbbac...02e1fbbefd