Allow building QtWebKit on Windows with non-ICU Qt build.

Also, from now use_wchar_unicode is never silently enabled
when ICU config test fails, and requires qmake argument
WEBKIT_CONFIG+=use_wchar_unicode.

Change-Id: I434f5245c796b723a3bb116f62f8d53d05c3b4f7
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

3 files changed, 4 insertions, 6 deletions

diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri
index d1aad9f9b..e525aa1fc 100644
--- a/Source/WebCore/Target.pri
+++ b/Source/WebCore/Target.pri
@@ -1122,7 +1122,6 @@ SOURCES += \
     platform/text/TextCodecUTF8.cpp \
     platform/text/TextCodecICU.cpp \
     platform/text/TextEncoding.cpp \
-    platform/text/TextEncodingDetectorICU.cpp \
     platform/text/TextEncodingRegistry.cpp \
     platform/text/TextStream.cpp \
     platform/ThreadGlobalData.cpp \
@@ -2978,11 +2977,12 @@ mac {
         platform/text/cf/StringImplCF.cpp
 }
 
-contains(QT_CONFIG,icu)|mac: SOURCES += platform/text/TextBreakIteratorICU.cpp
 use?(wchar_unicode): {
     SOURCES += platform/text/wchar/TextBreakIteratorWchar.cpp \
                platform/text/TextEncodingDetectorNone.cpp
-    SOURCES -= platform/text/TextEncodingDetectorICU.cpp
+} else {
+    SOURCES += platform/text/TextBreakIteratorICU.cpp \
+               platform/text/TextEncodingDetectorICU.cpp
 }
 
 mac {
diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf
index 757ddfe4e..49f849576 100644
--- a/Tools/qmake/mkspecs/features/configure.prf
+++ b/Tools/qmake/mkspecs/features/configure.prf
@@ -120,7 +120,7 @@ defineTest(finalizeConfigure) {
     }
 
     # Sanity checks that would prevent us from building the whole project altogether.
-    !android:!mac:!config_icu {
+    !config_icu:!osx:!use?(wchar_unicode) {
        addReasonForSkippingBuild("ICU is required.")
     }
     production_build:blackberry {
diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf
index 6a9e9a219..bb3432bd2 100644
--- a/Tools/qmake/mkspecs/features/features.prf
+++ b/Tools/qmake/mkspecs/features/features.prf
@@ -142,8 +142,6 @@ defineTest(detectFeatures) {
     # IndexedDB requires leveldb
     enable?(indexed_database): WEBKIT_CONFIG += use_leveldb
 
-    !config_icu:!mac: WEBKIT_CONFIG += use_wchar_unicode
-
     export(WEBKIT_CONFIG)
     export(CONFIGURE_WARNINGS)
 }