From 008943132609e1a92e500decf391bc75da320d2f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Feb 2013 10:39:57 +0100 Subject: [PATCH] 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 --- qt.pro | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/qt.pro b/qt.pro index bcf2f6af..0d118de0 100644 --- a/qt.pro +++ b/qt.pro @@ -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) {