diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-04 07:03:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-04 07:03:54 +0200 |
| commit | 6a36fe904c7183aba8e7f1977ff86303d84ff62b (patch) | |
| tree | 6034e7bfdf0d14b72512b36f63d35a936b32e0dc /src/gui/painting/qt_attribution.json | |
| parent | 18088d4706bdd2fefafe7dbb44dc467126f2c795 (diff) | |
| parent | db57af5a0d7aa0687a19fef1cd385bee0f26f7b6 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/corelib/codecs/qicucodec.cpp
src/dbus/qdbusserver.cpp
src/gui/painting/qbezier.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
src/plugins/printsupport/cups/qppdprintdevice.cpp
Change-Id: I2703128bb64baf5580fbc2c2061b55b0f0611d2a
Diffstat (limited to 'src/gui/painting/qt_attribution.json')
| -rw-r--r-- | src/gui/painting/qt_attribution.json | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/gui/painting/qt_attribution.json b/src/gui/painting/qt_attribution.json index 9d3debc1b9..7b16e8c211 100644 --- a/src/gui/painting/qt_attribution.json +++ b/src/gui/painting/qt_attribution.json @@ -41,5 +41,20 @@ "LicenseId": "MIT", "LicenseFile": "WEBGRADIENTS_LICENSE.txt", "Copyright": "Copyright (c) 2017 itmeo" + }, + { + "Id": "xserverhelper", + "Name": "X Server helper", + "QDocModule": "qtgui", + "QtUsage": "Used in Qt GUI (QRegion).", + "Files": "qregion.cpp", + + "Description": "Code from X11's region.h, Region.c, poly.h, and PolyReg.c", + "Homepage": "https://www.x.org/", + "License": "X11 License and Historical Permission Notice and Disclaimer", + "LicenseId": "X11 AND HPND", + "LicenseFile": "XCONSORTIUM_LICENSE.txt", + "Copyright": "Copyright (c) 1987, 1988 X Consortium +Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts." } ] |