diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-27 11:08:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-27 11:08:55 +0200 |
| commit | d0fcaa7eaaae85ddbf0a78efa59b341380c101a4 (patch) | |
| tree | 9b3422ae33ef9dfcda0af228c56c3d2eeed7b0c3 /src/3rdparty | |
| parent | f6ce2d42b3cbe049ebcf1a2349a5cd4dde2c6d24 (diff) | |
| parent | 5e64957ee4162ecf4456306a530a68761c2b127f (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/corelib/global/qconfig-bootstrapped.h
src/widgets/util/qcompleter.cpp
Change-Id: I4f44f0f074982530f2f2e750ce696230b2754cf3
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/iaccessible2/qt_attribution.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/iaccessible2/qt_attribution.json b/src/3rdparty/iaccessible2/qt_attribution.json index 545ffe4d63..290d0d4b7d 100644 --- a/src/3rdparty/iaccessible2/qt_attribution.json +++ b/src/3rdparty/iaccessible2/qt_attribution.json @@ -6,6 +6,7 @@ "Description": "IAccessible2 is a new accessibility API which complements Microsoft's earlier work on MSAA", "Homepage": "http://www.linuxfoundation.org/collaborate/workgroups/accessibility/iaccessible2", + "Version": "1.3.0", "License": "BSD 3-clause \"New\" or \"Revised\" License", "LicenseId": "BSD-3-Clause", "LicenseFile": "LICENSE", |