diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-07-25 07:02:59 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-07-25 11:01:33 +0000 |
| commit | 29154b490c639b68f385e26a59f03912fa34f53b (patch) | |
| tree | 1fbbef0e6351ba769a032a420815eebb13b65aeb /main/qt/qt4-icu59.patch | |
| parent | baaca341e05b6ef2ac614ea99effce98eac93a58 (diff) | |
| download | aports-29154b490c639b68f385e26a59f03912fa34f53b.tar.bz2 aports-29154b490c639b68f385e26a59f03912fa34f53b.tar.xz | |
main/qt: fix build with icu-59
Diffstat (limited to 'main/qt/qt4-icu59.patch')
| -rw-r--r-- | main/qt/qt4-icu59.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/main/qt/qt4-icu59.patch b/main/qt/qt4-icu59.patch new file mode 100644 index 0000000000..982b23a7ee --- /dev/null +++ b/main/qt/qt4-icu59.patch @@ -0,0 +1,40 @@ +--- qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qlocale_icu.cpp~ 2017-04-25 07:42:22.000000000 +0000 ++++ qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qlocale_icu.cpp 2017-04-25 07:44:34.675363008 +0000 +@@ -43,6 +43,8 @@ + #include "qlibrary.h" + #include "qdebug.h" + ++#define UCHAR_TYPE unsigned short ++ + #include "unicode/uversion.h" + #include "unicode/ucol.h" + +--- qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qstring.cpp 2015-05-07 16:14:48.000000000 +0200 ++++ qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qstring.cpp 2017-05-04 04:26:21.101965075 +0200 +@@ -6773,7 +6773,7 @@ + QString locale_arg; + if (d.locale_occurrences > 0) { + QLocale locale; +- if (!locale.numberOptions() & QLocale::OmitGroupSeparator) ++ if (~locale.numberOptions() & QLocale::OmitGroupSeparator) + flags |= QLocalePrivate::ThousandsGroup; + locale_arg = locale.d()->longLongToString(a, -1, base, fieldWidth, flags); + } +@@ -6817,7 +6817,7 @@ + QString locale_arg; + if (d.locale_occurrences > 0) { + QLocale locale; +- if (!locale.numberOptions() & QLocale::OmitGroupSeparator) ++ if (~locale.numberOptions() & QLocale::OmitGroupSeparator) + flags |= QLocalePrivate::ThousandsGroup; + locale_arg = locale.d()->unsLongLongToString(a, -1, base, fieldWidth, flags); + } +@@ -6952,7 +6952,7 @@ + if (d.locale_occurrences > 0) { + QLocale locale; + +- if (!locale.numberOptions() & QLocale::OmitGroupSeparator) ++ if (~locale.numberOptions() & QLocale::OmitGroupSeparator) + flags |= QLocalePrivate::ThousandsGroup; + locale_arg = locale.d()->doubleToString(a, prec, form, fieldWidth, flags); + } |