Merge branch 'qt5_libpng' into release-7.2

SuperBuild/patches/QT5/qt5-2-png-freetype-detection-all.diff

+diff -burN  qt-everywhere-src-5.14.1_orig/qtbase/src/gui/configure.json qt-everywhere-src-5.14.1/qtbase/src/gui/configure.json--- qt-everywhere-src-5.14.1_orig/qtbase/src/gui/configure.json   2020-07-27 18:13:35.779000908 +0200
++++ qt-everywhere-src-5.14.1/qtbase/src/gui/configure.json  2020-07-27 18:18:11.226987484 +0200
+@@ -239,10 +239,10 @@
+             },
+             "headers": "ft2build.h",
+             "sources": [
+-                { "type": "pkgConfig", "args": "freetype2" },
+                 { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
+                 { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
+-                { "libs": "-lfreetype" }
++                { "libs": "-lfreetype" },
++                { "type": "pkgConfig", "args": "freetype2" }
+             ],
+             "use": [
+                 { "lib": "zlib", "condition": "features.system-zlib" }
+@@ -397,12 +397,12 @@
+             },
+             "headers": "png.h",
+             "sources": [
+-                { "type": "pkgConfig", "args": "libpng" },
+                 { "libs": "-llibpng16", "condition": "config.msvc" },
+                 { "libs": "-llibpng", "condition": "config.msvc" },
+                 { "libs": "-lpng16", "condition": "!config.msvc" },
+                 { "libs": "-lpng", "condition": "!config.msvc" },
+-                { "libs": "-s USE_LIBPNG=1", "condition": "config.wasm" }
++                { "libs": "-s USE_LIBPNG=1", "condition": "config.wasm" },
++                { "type": "pkgConfig", "args": "libpng" }
+             ],
+             "use": [
+                 { "lib": "zlib", "condition": "features.system-zlib" }

SuperBuild/patches/QT5/qt5-3-undefined-references-linux.diff

+diff -burN  qt-everywhere-src-5.14.1/qttools/src/assistant/assistant/assistant.pro qt-everywhere-src-5.14.1_orig/qttools/src/assistant/assistant/assistant.pro
+--- qt-everywhere-src-5.14.1/qttools/src/assistant/assistant/assistant.pro	2020-01-17 06:51:13.000000000 +0100
++++ qt-everywhere-src-5.14.1_orig/qttools/src/assistant/assistant/assistant.pro	2020-08-24 15:19:57.044203325 +0200
+@@ -45,6 +45,8 @@
+     openpagesmanager.h \
+     openpagesswitcher.h
+ 
++LIBS += -lpng
++
+ SOURCES += aboutdialog.cpp \
+     bookmarkdialog.cpp \
+     bookmarkfiltermodel.cpp \
+
+--- qt-everywhere-src-5.14.1/qttools/src/assistant/qhelpgenerator/qhelpgenerator.pro	2020-01-17 06:51:13.000000000 +0100
++++ qt-everywhere-src-5.14.1_orig/qttools/src/assistant/qhelpgenerator/qhelpgenerator.pro	2020-08-24 15:42:12.924236449 +0200
+@@ -15,5 +15,7 @@
+            qhelpprojectdata_p.h \
+            qhelpdatainterface_p.h
+ 
++LIBS += -lpng
++
+ QMAKE_TARGET_DESCRIPTION = "Qt Compressed Help File Generator"
+ load(qt_tool)
+
+--- qt-everywhere-src-5.14.1/qttools/src/designer/src/designer/designer.pro	2020-01-17 06:51:13.000000000 +0100
++++ qt-everywhere-src-5.14.1_orig/qttools/src/designer/src/designer/designer.pro	2020-08-24 15:44:13.892239448 +0200
+@@ -53,6 +53,8 @@
+     assistantclient.cpp \
+     mainwindow.cpp
+ 
++LIBS += -lpng
++
+ PRECOMPILED_HEADER=qdesigner_pch.h
+ 
+ FORMS += saveformastemplate.ui \
+
+--- qt-everywhere-src-5.14.1/qttools/src/pixeltool/pixeltool.pro	2020-01-17 06:51:13.000000000 +0100
++++ qt-everywhere-src-5.14.1_orig/qttools/src/pixeltool/pixeltool.pro	2020-08-24 15:45:42.572241647 +0200
+@@ -6,5 +6,6 @@
+ 
+ SOURCES += main.cpp qpixeltool.cpp
+ HEADERS += qpixeltool.h
++LIBS += -lpng
+ 
+ load(qt_app)
+
+--- qt-everywhere-src-5.14.1/qttools/src/linguist/linguist/linguist.pro	2020-01-17 06:51:13.000000000 +0100
++++ qt-everywhere-src-5.14.1_orig/qttools/src/linguist/linguist/linguist.pro	2020-08-24 15:59:27.476262101 +0200
+@@ -55,6 +55,8 @@
+     translationsettingsdialog.h \
+     ../shared/simtexth.h
+ 
++LIBS += -lpng
++
+ contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
+ DEFINES += QT_KEYWORDS
+ TARGET = linguist
+
+--- qt-everywhere-src-5.14.1/qttools/src/qtdiag/qtdiag.pro	2020-01-17 06:51:13.000000000 +0100
++++ qt-everywhere-src-5.14.1_orig/qttools/src/qtdiag/qtdiag.pro	2020-08-24 15:52:35.732251892 +0200
+@@ -10,5 +10,6 @@
+ 
+ SOURCES += main.cpp qtdiag.cpp
+ HEADERS += qtdiag.h
++LIBS += -lpng
+ 
+ load(qt_app)