diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-08 09:34:24 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-08 09:34:24 +0100 |
| commit | 0e96b5fe482802935ae202e2297404845e440d71 (patch) | |
| tree | 79c566f18bc605261f69d750d2935b91edba3861 /dist/changes-5.12.0 | |
| parent | da43362921a62ea3163a042be20ec0f550d05cfa (diff) | |
| parent | 5733dfbd90fd059e7310786faefb022b00289592 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.12.1
Conflicts:
src/widgets/kernel/qtooltip.cpp
Change-Id: Ic2f9a425359050eb56b3a4e5162cf5e3447058c8
Diffstat (limited to 'dist/changes-5.12.0')
| -rw-r--r-- | dist/changes-5.12.0 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dist/changes-5.12.0 b/dist/changes-5.12.0 index b5e664fc5a..15b12b60ab 100644 --- a/dist/changes-5.12.0 +++ b/dist/changes-5.12.0 @@ -48,6 +48,7 @@ information about a particular change. - The minimal required version of libxcb is now 1.9. Bundled xcb sources were updated to libxcb 1.9.1 built with xcb-proto 1.8. - [QTBUG-67654] Updated CLDR to version 33.1 + - [QTBUG-71144] Updated CLDR to version 34 - [QTBUG-66561][QTBUG-70008] double-conversion got updated to upstream version 3.1.1. - libjpeg-turbo was updated to version 2.0.0 |