From b2e1d373f2f139e44c5bf48182d60106af804a51 Mon Sep 17 00:00:00 2001
From: Roland Rossgotterer <roland.rossgotterer@gmail.com>
Date: Wed, 30 Jan 2019 13:50:15 +0100
Subject: [PATCH] Cleanup and resort the installed Qt5 libraries

Adding Qwt as a library added a couple of more Qt5 dependencies that were undetected so far. So I went through all our binaries and dependencies and tried to find all required sub dependencies. After that, the lists have been sorted for easier maintenance.
---
 install.pri                               | 20 +++++++++--------
 installer/installbuilder/qt5-binaries.xml | 27 +++++++++++++++++++----
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/install.pri b/install.pri
index 09cc39de5..ffab9810b 100644
--- a/install.pri
+++ b/install.pri
@@ -10,13 +10,14 @@ INSTALLS += text_files_target
 
 win32 {
     QT5_LIBRARIES *= Qt5Core$${DLL_DEBUG_SUFFIX}.dll
-    QT5_LIBRARIES *= Qt5Gui$${DLL_DEBUG_SUFFIX}.dll
-    QT5_LIBRARIES *= Qt5Network$${DLL_DEBUG_SUFFIX}.dll
     QT5_LIBRARIES *= Qt5DBus$${DLL_DEBUG_SUFFIX}.dll
-    QT5_LIBRARIES *= Qt5Xml$${DLL_DEBUG_SUFFIX}.dll
+    QT5_LIBRARIES *= Qt5Gui$${DLL_DEBUG_SUFFIX}.dll
     QT5_LIBRARIES *= Qt5Multimedia$${DLL_DEBUG_SUFFIX}.dll
+    QT5_LIBRARIES *= Qt5Network$${DLL_DEBUG_SUFFIX}.dll
+    QT5_LIBRARIES *= Qt5OpenGL$${DLL_DEBUG_SUFFIX}.dll
     QT5_LIBRARIES *= Qt5Svg$${DLL_DEBUG_SUFFIX}.dll
     QT5_LIBRARIES *= Qt5Widgets$${DLL_DEBUG_SUFFIX}.dll
+    QT5_LIBRARIES *= Qt5Xml$${DLL_DEBUG_SUFFIX}.dll
 
     qt5_target.path = $${PREFIX}/bin
     QT5_LIBRARY_DIR = $$[QT_INSTALL_BINS]
@@ -24,15 +25,17 @@ win32 {
 else:macx {
     # MacOS workaround using rsync. Otherwise all headers are also copied.
     qt5_target.path = $${PREFIX}/lib/QtCore.framework
+    qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtConcurrent.framework/ $${PREFIX}/lib/QtConcurrent.framework/ &&
     qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtCore.framework/ $${PREFIX}/lib/QtCore.framework/ &&
-    qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtGui.framework/ $${PREFIX}/lib/QtGui.framework/ &&
-    qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtNetwork.framework/ $${PREFIX}/lib/QtNetwork.framework/ &&
     qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtDBus.framework/ $${PREFIX}/lib/QtDBus.framework/ &&
-    qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtXml.framework/ $${PREFIX}/lib/QtXml.framework/ &&
+    qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtGui.framework/ $${PREFIX}/lib/QtGui.framework/ &&
     qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtMultimedia.framework/ $${PREFIX}/lib/QtMultimedia.framework/ &&
+    qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtNetwork.framework/ $${PREFIX}/lib/QtNetwork.framework/ &&
+    qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtOpenGL.framework/ $${PREFIX}/lib/QtOpenGL.framework/ &&
+    qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtPrintSupport.framework/ $${PREFIX}/lib/QtPrintSupport.framework/ &&
     qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtSvg.framework/ $${PREFIX}/lib/QtSvg.framework/ &&
     qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtWidgets.framework/ $${PREFIX}/lib/QtWidgets.framework/ &&
-    qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtPrintSupport.framework/ $${PREFIX}/lib/QtPrintSupport.framework/
+    qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtXml.framework/ $${PREFIX}/lib/QtXml.framework/
 }
 else:unix: {
     QT5_LIBRARIES *= libQt5Core.so.5
@@ -46,8 +49,7 @@ else:unix: {
     QT5_LIBRARIES *= libQt5Widgets.so.5
     QT5_LIBRARIES *= libQt5XcbQpa.so.5
     QT5_LIBRARIES *= libQt5Xml.so.5
-    greaterThan(QT_MINOR_VERSION, 9): QT5_LIBRARIES *= libQt5MultimediaGstTools.so.5
-    else: QT5_LIBRARIES *= libqgsttools_p.so.1
+    QT5_LIBRARIES *= libQt5MultimediaGstTools.so.5
 
     ICU_LIBRARIES *= libicui18n.so.56
     ICU_LIBRARIES *= libicuuc.so.56
diff --git a/installer/installbuilder/qt5-binaries.xml b/installer/installbuilder/qt5-binaries.xml
index eeae7f62b..3f079b457 100644
--- a/installer/installbuilder/qt5-binaries.xml
+++ b/installer/installbuilder/qt5-binaries.xml
@@ -24,10 +24,18 @@
                     <allowWildcards>1</allowWildcards>
                     <origin>../../dist/bin/Qt5Gui*.dll</origin>
                 </distributionFile>
+                <distributionFile>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/bin/Qt5Multimedia*.dll</origin>
+                </distributionFile>
                 <distributionFile>
                     <allowWildcards>1</allowWildcards>
                     <origin>../../dist/bin/Qt5Network*.dll</origin>
                 </distributionFile>
+                <distributionFile>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/bin/Qt5OpenGL*.dll</origin>
+                </distributionFile>
                 <distributionFile>
                     <allowWildcards>1</allowWildcards>
                     <origin>../../dist/bin/Qt5Svg*.dll</origin>
@@ -40,10 +48,6 @@
                     <allowWildcards>1</allowWildcards>
                     <origin>../../dist/bin/Qt5Xml*.dll</origin>
                 </distributionFile>
-                <distributionFile>
-                    <allowWildcards>1</allowWildcards>
-                    <origin>../../dist/bin/Qt5Multimedia*.dll</origin>
-                </distributionFile>
                 <distributionFile>
                     <allowWildcards>1</allowWildcards>
                     <origin>../../dist/bin/dbus-1-3.dll</origin>
@@ -90,9 +94,18 @@
                 <distributionFile>
                     <origin>../../dist/lib/libQt5Multimedia.so.5</origin>
                 </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libQt5MultimediaGstTools.so.5</origin>
+                </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libQt5MultimediaWidgets.so.5</origin>
+                </distributionFile>
                 <distributionFile>
                     <origin>../../dist/lib/libQt5Network.so.5</origin>
                 </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libQt5OpenGL.so.5</origin>
+                </distributionFile>
                 <distributionFile>
                     <origin>../../dist/lib/libQt5Svg.so.5</origin>
                 </distributionFile>
@@ -116,6 +129,9 @@
                 <distributionFile>
                     <origin>../../dist/lib/libdbus-1.3.dylib</origin>
                 </distributionFile>
+                <distributionDirectory>
+                    <origin>../../dist/lib/QtConcurrent.framework</origin>
+                </distributionDirectory>
                 <distributionDirectory>
                     <origin>../../dist/lib/QtCore.framework</origin>
                 </distributionDirectory>
@@ -131,6 +147,9 @@
                 <distributionDirectory>
                     <origin>../../dist/lib/QtNetwork.framework</origin>
                 </distributionDirectory>
+                <distributionDirectory>
+                    <origin>../../dist/lib/QtOpenGL.framework</origin>
+                </distributionDirectory>
                 <distributionDirectory>
                     <origin>../../dist/lib/QtPrintSupport.framework</origin>
                 </distributionDirectory>