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

don't make webkit build conditional on ICU

Browse Source 
webkit now contains its own configure magic to disable itself.

Change-Id: Ibb962fac8ea6275400879c15f24d21f0f8dee855
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
This commit is contained in:
Oswald Buddenhagen
2013-02-20 10:39:57 +01:00
committed by The Qt Project
parent 3d960ec9a9
commit 0089431326
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
qt.pro
View File

@@ -106,15 +106,11 @@ exists(qtactiveqt/qtactiveqt.pro) {
module_qttools.depends += module_qtactiveqt
}
exists(qtwebkit/WebKit.pro) {
mac|contains(QT_CONFIG, icu) {
SUBDIRS += module_qtwebkit
module_qttools.depends += module_qtwebkit
module_qtquick1.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.")
SUBDIRS += module_qtwebkit
module_qttools.depends += module_qtwebkit
module_qtquick1.depends += module_qtwebkit
exists(qtwebkit-examples-and-demos/qtwebkit-examples-and-demos.pro) {
SUBDIRS += module_qtwebkit_examples_and_demos
}
}
exists(qttools/qttools.pro) {