diff options
Diffstat (limited to 'qt5-qtwebkit-dont-depend-on-icu.patch')
| -rw-r--r-- | qt5-qtwebkit-dont-depend-on-icu.patch | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/qt5-qtwebkit-dont-depend-on-icu.patch b/qt5-qtwebkit-dont-depend-on-icu.patch index 1a72e9a9fe6a..46f5a19fce15 100644 --- a/qt5-qtwebkit-dont-depend-on-icu.patch +++ b/qt5-qtwebkit-dont-depend-on-icu.patch @@ -4,10 +4,10 @@ } # 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.") - } -+# !android:!mac:!config_icu { ++# !config_icu:!osx:!use?(wchar_unicode) { +# addReasonForSkippingBuild("ICU is required.") +# } production_build:blackberry { @@ -254,14 +254,3 @@ { TextBreakIterator* lineBreakIterator = 0; if (staticLineBreakIterator) { ---- qtwebkit-opensource-src-5.4.0/Tools/qmake/mkspecs/features/features.prf.orig 2014-12-29 23:30:47.372582743 +0100 -+++ qtwebkit-opensource-src-5.4.0/Tools/qmake/mkspecs/features/features.prf 2014-12-29 23:31:08.021797817 +0100 -@@ -142,7 +142,7 @@ - # IndexedDB requires leveldb - enable?(indexed_database): WEBKIT_CONFIG += use_leveldb - -- !config_icu:!mac: WEBKIT_CONFIG += use_wchar_unicode -+# !config_icu:!mac: WEBKIT_CONFIG += use_wchar_unicode - - export(WEBKIT_CONFIG) - export(CONFIGURE_WARNINGS) |