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 /Tools/qmake | |
| 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 'Tools/qmake')
| -rw-r--r-- | Tools/qmake/mkspecs/features/configure.prf | 2 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/features.prf | 2 |
2 files changed, 1 insertions, 3 deletions
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) } |