diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-08-16 13:34:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-08-16 18:48:59 +0200 |
| commit | 8559bf934def636ccff487464adb600d219f8778 (patch) | |
| tree | 3063152f487798c7103dbf61216e48c37586a4e1 /src/3rdparty | |
| parent | f1a6b97fe2d3eda9455b13bb79828f250d46b92e (diff) | |
| parent | a0ebd98f58b2d92c34fafbc620f024caa36bf0ad (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/corelib/global/qconfig-bootstrapped.h
src/plugins/platforms/xcb/qxcbbackingstore.cpp
Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I4af138ffb2f5306373244523768209e8873b2798
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/xkbcommon/qt_attribution.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/xkbcommon/qt_attribution.json b/src/3rdparty/xkbcommon/qt_attribution.json index 8ee0df1b22..4be9b42917 100644 --- a/src/3rdparty/xkbcommon/qt_attribution.json +++ b/src/3rdparty/xkbcommon/qt_attribution.json @@ -6,6 +6,7 @@ "Description": "xkbcommon is a keymap compiler and support library which processes a reduced subset of keymaps as defined by the XKB specification.", "Homepage": "http://xkbcommon.org/", + "Version": "0.4.1", "License": "MIT Licenses (with no-advertisement clause)", "LicenseId": "MIT", "LicenseFile": "COPYING", |