From ef4e11025db6d40700bc12a1acbd6888f2b43ce2 Mon Sep 17 00:00:00 2001
From: Roland Rossgotterer <roland.rossgotterer@gmail.com>
Date: Tue, 21 May 2019 14:46:33 +0200
Subject: [PATCH] Install and package QtQml

ref T665
---
 install.pri                               |  3 +++
 installer/installbuilder/qt5-binaries.xml | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/install.pri b/install.pri
index 5e738e5c8..1693fff38 100644
--- a/install.pri
+++ b/install.pri
@@ -15,6 +15,7 @@ win32 {
     QT5_LIBRARIES *= Qt5Multimedia$${DLL_DEBUG_SUFFIX}.dll
     QT5_LIBRARIES *= Qt5Network$${DLL_DEBUG_SUFFIX}.dll
     QT5_LIBRARIES *= Qt5OpenGL$${DLL_DEBUG_SUFFIX}.dll
+    QT5_LIBRARIES *= Qt5Qml$${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
@@ -32,6 +33,7 @@ else:macx {
     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]/QtQml.framework/ $${PREFIX}/lib/QtQml.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/ &&
@@ -45,6 +47,7 @@ else:unix: {
     QT5_LIBRARIES *= libQt5MultimediaWidgets.so.5
     QT5_LIBRARIES *= libQt5Network.so.5
     QT5_LIBRARIES *= libQt5OpenGL.so.5
+    QT5_LIBRARIES *= libQt5Qml.so.5
     QT5_LIBRARIES *= libQt5Svg.so.5
     QT5_LIBRARIES *= libQt5Widgets.so.5
     QT5_LIBRARIES *= libQt5XcbQpa.so.5
diff --git a/installer/installbuilder/qt5-binaries.xml b/installer/installbuilder/qt5-binaries.xml
index 3f079b457..63f028862 100644
--- a/installer/installbuilder/qt5-binaries.xml
+++ b/installer/installbuilder/qt5-binaries.xml
@@ -36,6 +36,10 @@
                     <allowWildcards>1</allowWildcards>
                     <origin>../../dist/bin/Qt5OpenGL*.dll</origin>
                 </distributionFile>
+                <distributionFile>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/bin/Qt5Qml*.dll</origin>
+                </distributionFile>
                 <distributionFile>
                     <allowWildcards>1</allowWildcards>
                     <origin>../../dist/bin/Qt5Svg*.dll</origin>
@@ -106,6 +110,9 @@
                 <distributionFile>
                     <origin>../../dist/lib/libQt5OpenGL.so.5</origin>
                 </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/lib/libQt5Qml.so.5</origin>
+                </distributionFile>
                 <distributionFile>
                     <origin>../../dist/lib/libQt5Svg.so.5</origin>
                 </distributionFile>
@@ -150,6 +157,9 @@
                 <distributionDirectory>
                     <origin>../../dist/lib/QtOpenGL.framework</origin>
                 </distributionDirectory>
+                <distributionDirectory>
+                    <origin>../../dist/lib/QtQml.framework</origin>
+                </distributionDirectory>
                 <distributionDirectory>
                     <origin>../../dist/lib/QtPrintSupport.framework</origin>
                 </distributionDirectory>