diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-23 09:27:52 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-23 09:27:52 +0100 |
| commit | efb46ea7ccf6fe8f89a8228bb5afe34c51901824 (patch) | |
| tree | ea83ffeb690c735cbf2a9508e56a20ce2378fcc9 /src/testlib | |
| parent | cdc30acbdebdfb185df0a871537dd22411eae4f4 (diff) | |
| parent | 5cfd5fd9d7ece7e1eb3c4d2be8ec342b376acf38 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I01dfc41e18333ac55954296cef8f01475adab27e
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/3rdparty/qt_attribution.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/testlib/3rdparty/qt_attribution.json b/src/testlib/3rdparty/qt_attribution.json index 49d12580bd..47625634e5 100644 --- a/src/testlib/3rdparty/qt_attribution.json +++ b/src/testlib/3rdparty/qt_attribution.json @@ -32,12 +32,12 @@ Copyright (c) 2003, 2006 Massachusetts Institute of Technology" "Id": "linuxperf", "Name": "Linux Performance Events", "QDocModule": "qttestlib", - "QtUsage": "Used on Linux and Android in the Qt Test module.", + "QtUsage": "Used on Linux and Android in the Qt Test module. Note that this is a copy of the respective Linux header, and the clarifications of the Linux Syscall Note apply.", "Files": "linux_perf_event_p.h", "Description": "Allows access to the Linux kernel's performance events.", - "License": "GNU General Public License v2.0 only", - "LicenseId": "GPL-2.0", + "License": "GNU General Public License v2.0 only with Linux Syscall Note", + "LicenseId": "GPL-2.0 WITH Linux-syscall-note", "LicenseFile": "LINUX_LICENSE.txt", "Copyright": "Copyright (C) 2008-2009, Thomas Gleixner <tglx@linutronix.de> Copyright (C) 2008-2011, Red Hat, Inc., Ingo Molnar |