diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-03-18 21:57:07 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2016-04-05 21:22:31 +0000 |
| commit | b555ab7169f23d47fe980aa0c76c0eb9d18d6ab1 (patch) | |
| tree | 9c4a66a4b34b00969819d00cec3a34127fa25e07 /Source | |
| parent | 3b4c850361abbc2aae556dbf99c8e4c8086ae569 (diff) | |
| download | qtwebkit-b555ab7169f23d47fe980aa0c76c0eb9d18d6ab1.tar.gz | |
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>
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/Target.pri | 6 |
1 files changed, 3 insertions, 3 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 { |