diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-10 08:16:20 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-10 08:16:20 +0200 |
| commit | a20da2353cc308aab15e3efa05ab7d899e9c6ca7 (patch) | |
| tree | 63881eb44f19384ebfb0e0443291b8f9ab82f149 /src/3rdparty | |
| parent | 95f787bfdc890c259e8b347bdad9123d534efe0f (diff) | |
| parent | eaf20420f8a4d72c804a9d3725c3e294b34c78c8 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
mkspecs/win32-clang-msvc/qmake.conf
src/gui/image/qpnghandler.cpp
Change-Id: Ied79d02912ffb3a307a99483df7db08c7f9d0cd8
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/wintab/LICENSE.txt | 2 | ||||
| -rw-r--r-- | src/3rdparty/wintab/qt_attribution.json | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/3rdparty/wintab/LICENSE.txt b/src/3rdparty/wintab/LICENSE.txt new file mode 100644 index 0000000000..6c03ad2aff --- /dev/null +++ b/src/3rdparty/wintab/LICENSE.txt @@ -0,0 +1,2 @@ +The text and information contained in this file may be freely used, +copied, or distributed without compensation or licensing restrictions. diff --git a/src/3rdparty/wintab/qt_attribution.json b/src/3rdparty/wintab/qt_attribution.json index f0c9b49841..1b9c55552e 100644 --- a/src/3rdparty/wintab/qt_attribution.json +++ b/src/3rdparty/wintab/qt_attribution.json @@ -5,9 +5,9 @@ "QtUsage": "Used in the Qt platform plugin for Windows. Configure with -no-feature-tabletevent to avoid.", "Description": "Wintab is a de facto API for pointing devices on Windows.", - "Version": "Upstream no longer offers updates; treat as final", - "Homepage": "http://www.pointing.com/Wintab.html", - "License": "Public Domain", + "PackageComment": "Upstream http://www.pointing.com/Wintab.html no longer offers updates; treat as final", + "License": "Custom License", + "LicenseFile": "LICENSE.txt", "LicenseId": "NONE", "Copyright": "Copyright 1991-1998 by LCS/Telegraphics." } |