Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: Id1e4664d3c942226b76e2c3b338df3116ff89297

11 files changed, 19 insertions, 2 deletions

diff --git a/src/3rdparty/easing/qt_attribution.json b/src/3rdparty/easing/qt_attribution.json
index b6240c61c8..bccc67b6d4 100644
--- a/src/3rdparty/easing/qt_attribution.json
+++ b/src/3rdparty/easing/qt_attribution.json
@@ -3,7 +3,10 @@
     "Name": "Easing Equations by Robert Penner",
     "QDocModule": "qtcore",
     "QtUsage": "Used in Qt Core (QEasingCurve).",
+    "Files": "easing.cpp",
 
+    "Homepage": "treat as final",
+    "Homepage": "http://robertpenner.com/easing/",
     "License": "BSD 3-clause \"New\" or \"Revised\" License",
     "LicenseId": "BSD-3-Clause",
     "LicenseFile": "LICENSE",
diff --git a/src/3rdparty/forkfd/qt_attribution.json b/src/3rdparty/forkfd/qt_attribution.json
index f004116753..ebbb19c718 100644
--- a/src/3rdparty/forkfd/qt_attribution.json
+++ b/src/3rdparty/forkfd/qt_attribution.json
@@ -3,6 +3,8 @@
     "Name": "forkfd",
     "QDocModule": "qtcore",
     "QtUsage": "Used on most Unix platforms in Qt Core.",
+    "Files": "No upstream; treat as final",
+    "Files": "forkfd.c forkfd.h forkfd_gcc.h",
 
     "License": "MIT License",
     "LicenseId": "MIT",
diff --git a/src/3rdparty/freebsd/qt_attribution.json b/src/3rdparty/freebsd/qt_attribution.json
index 57f425cdbc..6a4a9ca1af 100644
--- a/src/3rdparty/freebsd/qt_attribution.json
+++ b/src/3rdparty/freebsd/qt_attribution.json
@@ -3,8 +3,13 @@
     "Name": "FreeBSD strtoll and strtoull",
     "QDocModule": "qtcore",
     "QtUsage": "Used in Qt Core.",
+    "Files": "strtoll.c strtoull.c",
 
     "Description": "strtoll() and strtoull() are functions for converting a string to (unsigned) long long integer.",
+    "Homepage": "https://github.com/freebsd/freebsd/",
+    "Upstream": "https://raw.githubusercontent.com/freebsd/freebsd/raw/tree/master/lib/libc/stdlib/$file",
+    "Version": "upstream has complicated with std locales; do not update",
+    "Version": "18b29f3fb8abee5d57ed8f4a44f806bec7e0eeff",
     "License": "BSD 3-clause \"New\" or \"Revised\" License",
     "LicenseId": "BSD-3-Clause",
     "LicenseFile": "LICENSE",
diff --git a/src/3rdparty/iaccessible2/qt_attribution.json b/src/3rdparty/iaccessible2/qt_attribution.json
index 290d0d4b7d..eea8314f1a 100644
--- a/src/3rdparty/iaccessible2/qt_attribution.json
+++ b/src/3rdparty/iaccessible2/qt_attribution.json
@@ -5,7 +5,7 @@
     "QtUsage": "Optionally used in the Windows platform plugin. Configure with -no-accessibility to avoid.",
 
     "Description": "IAccessible2 is a new accessibility API which complements Microsoft's earlier work on MSAA",
-    "Homepage": "http://www.linuxfoundation.org/collaborate/workgroups/accessibility/iaccessible2",
+    "Homepage": "https://wiki.linuxfoundation.org/accessibility/iaccessible2/",
     "Version": "1.3.0",
     "License": "BSD 3-clause \"New\" or \"Revised\" License",
     "LicenseId": "BSD-3-Clause",
diff --git a/src/3rdparty/icc/qt_attribution.json b/src/3rdparty/icc/qt_attribution.json
index 7a1c813522..06049954e3 100644
--- a/src/3rdparty/icc/qt_attribution.json
+++ b/src/3rdparty/icc/qt_attribution.json
@@ -4,9 +4,11 @@
         "Name": "sRGB color profile icc file",
         "QDocModule": "qtgui",
         "QtUsage": "Used in Qt Gui (Embedded into PDF/A-1b files generated by QPrinter/QPdfWriter).",
+        "Files": "No upstream: treat as final",
         "Files": "sRGB2014.icc",
 
         "Description": "An ICC color profile for PDF/A-1b compatible PDF files.",
+        "Homepage": "http://www.color.org/",
         "LicenseId": "ICC License",
         "License": "International Color Consortium License",
         "LicenseFile": "LICENSE.txt",
diff --git a/src/3rdparty/libpng/libpng.pro b/src/3rdparty/libpng/libpng.pro
index 577b61d833..a2f56669b4 100644
--- a/src/3rdparty/libpng/libpng.pro
+++ b/src/3rdparty/libpng/libpng.pro
@@ -10,7 +10,7 @@ MODULE_INCLUDEPATH = $$PWD
 
 load(qt_helper_lib)
 
-DEFINES += PNG_ARM_NEON_OPT=0
+DEFINES += PNG_ARM_NEON_OPT=0 PNG_POWERPC_VSX_OPT=0
 SOURCES += \
     png.c \
     pngerror.c \
diff --git a/src/3rdparty/md4/qt_attribution.json b/src/3rdparty/md4/qt_attribution.json
index f1bca24660..ea7e22705f 100644
--- a/src/3rdparty/md4/qt_attribution.json
+++ b/src/3rdparty/md4/qt_attribution.json
@@ -4,6 +4,7 @@
     "QDocModule": "qtcore",
     "QtUsage": "Used in Qt Core (QCryptographicHash). Configure with -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 to avoid.",
 
+    "Description": "Treat as final version; no upstream known",
     "Description": "An OpenSSL-compatible implementation of the RSA Data Security, Inc. MD4 Message-Digest Algorithm.",
     "License": "Public Domain",
     "Copyright": "Written by Alexander Peslyak - better known as Solar Designer <solar@openwall.com> - in 2001, and placed in the public domain. There's absolutely no warranty."
diff --git a/src/3rdparty/md5/qt_attribution.json b/src/3rdparty/md5/qt_attribution.json
index 52b613cf6c..e9783f9e49 100644
--- a/src/3rdparty/md5/qt_attribution.json
+++ b/src/3rdparty/md5/qt_attribution.json
@@ -4,6 +4,7 @@
     "QDocModule": "qtcore",
     "QtUsage": "Used in Qt Core (QCryptographicHash). Configure with -DQT_CRYPTOGRAPHICHASH_ONLY_SHA1 to avoid.",
 
+    "Description": "Treat as final version; no upstream known",
     "Description": "MD5 message-digest algorithm.",
     "License": "Public Domain",
     "Copyright": "Written by Colin Plumb in 1993, no copyright is claimed.
diff --git a/src/3rdparty/rfc6234/qt_attribution.json b/src/3rdparty/rfc6234/qt_attribution.json
index 9fc427b4a6..1cce430cf6 100644
--- a/src/3rdparty/rfc6234/qt_attribution.json
+++ b/src/3rdparty/rfc6234/qt_attribution.json
@@ -4,6 +4,7 @@
     "QDocModule": "qtcore",
     "QtUsage": "Used in Qt Core (QCryptographicHash and QMessageAuthenticationCode)",
 
+    "Description": "The RFC actually contains the code, embedded in RFC-boilerplate; presumably we extracted it; treat as final",
     "Description": "Implements the Secure Hash Algorithms SHA 384 and SHA-521",
     "License": "BSD 3-clause \"New\" or \"Revised\" License",
     "LicenseFile": "LICENSE",
diff --git a/src/3rdparty/tinycbor/qt_attribution.json b/src/3rdparty/tinycbor/qt_attribution.json
index 1d61534861..5b6355d013 100644
--- a/src/3rdparty/tinycbor/qt_attribution.json
+++ b/src/3rdparty/tinycbor/qt_attribution.json
@@ -5,6 +5,7 @@
     "QtUsage": "Used for QCborStreamReader and QCborStreamWriter.",
 
     "Description": "Concise Binary Object Representation (CBOR) Library",
+    "Version": "0.6.0",
     "Homepage": "https://github.com/intel/tinycbor",
     "License": "MIT License",
     "LicenseId": "MIT",
diff --git a/src/3rdparty/wintab/qt_attribution.json b/src/3rdparty/wintab/qt_attribution.json
index ac06e8da5a..f0c9b49841 100644
--- a/src/3rdparty/wintab/qt_attribution.json
+++ b/src/3rdparty/wintab/qt_attribution.json
@@ -5,6 +5,7 @@
     "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",
     "LicenseId": "NONE",