diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-08-22 10:35:12 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-08-22 10:35:12 +0200 |
| commit | 7533156b689c63fa26d66b3e6bacc598cb58456c (patch) | |
| tree | 99a535c86e26284e807cd70e9af9a616b79bceaa /src/testlib | |
| parent | 07eda676e45f6c3c7237581c3f4a9e39695697ab (diff) | |
| parent | 76c328b2b39617310993ce76e65665943b8c111c (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/gui/text/qtextengine.cpp
tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h
Change-Id: Ib9f968edbb0f3387c89bc25e914321d0738bfadc
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/3rdparty/qt_attribution.json | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/testlib/3rdparty/qt_attribution.json b/src/testlib/3rdparty/qt_attribution.json index 47625634e5..18522b6cd8 100644 --- a/src/testlib/3rdparty/qt_attribution.json +++ b/src/testlib/3rdparty/qt_attribution.json @@ -8,6 +8,7 @@ "Description": "An instrumentation framework for building dynamic analysis tools.", "Homepage": "http://valgrind.org/", + "Version": "3.3.0", "License": "BSD 4-clause \"Original\" or \"Old\" License", "LicenseId": "BSD-4-Clause", "LicenseFile": "VALGRIND_LICENSE.txt", @@ -36,6 +37,8 @@ Copyright (c) 2003, 2006 Massachusetts Institute of Technology" "Files": "linux_perf_event_p.h", "Description": "Allows access to the Linux kernel's performance events.", + "Homepage": "https://www.kernel.org", + "Version": "3.7", "License": "GNU General Public License v2.0 only with Linux Syscall Note", "LicenseId": "GPL-2.0 WITH Linux-syscall-note", "LicenseFile": "LINUX_LICENSE.txt", |