diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-20 10:39:57 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-20 22:55:06 +0100 |
| commit | 008943132609e1a92e500decf391bc75da320d2f (patch) | |
| tree | 3317c1c412057b7a3359b3fc185152ebd1b5b8f4 /qt.pro | |
| parent | 3d960ec9a9f11da295f603ca6fbfe80ee3681ae9 (diff) | |
don't make webkit build conditional on ICU
webkit now contains its own configure magic to disable itself.
Change-Id: Ibb962fac8ea6275400879c15f24d21f0f8dee855
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'qt.pro')
| -rw-r--r-- | qt.pro | 14 |
1 files changed, 5 insertions, 9 deletions
@@ -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) { |