From 84566d42f023266dd5d38e9c99bc0947775dcacb Mon Sep 17 00:00:00 2001
From: Gary Elshaw <69029666+GaryElshaw@users.noreply.github.com>
Date: Wed, 28 Dec 2022 06:18:51 +1300
Subject: [PATCH] Update qt cmakelists to include support for building svg
 (#4437)

---
 .github/workflows/actions.yml | 6 +++---
 CMakeLists.txt                | 2 +-
 dist/msi/CMakeLists.txt       | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index e80ef79ef..9946ded64 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -262,7 +262,7 @@ jobs:
         run: apk add --upgrade glibmm-dev gtkmm3-dev
       - name: Get Dependencies (Qt)
         if: ${{ needs.what-to-make.outputs.make-qt == 'true' }}
-        run: apk add --upgrade qt5-qtbase-dev qt5-qttools-dev
+        run: apk add --upgrade qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev
       - name: Get Source
         uses: actions/checkout@v3
         with:
@@ -534,7 +534,7 @@ jobs:
         run: apt-get install -y --no-install-recommends libglibmm-2.4-dev libgtkmm-3.0-dev
       - name: Get Dependencies (Qt)
         if: ${{ needs.what-to-make.outputs.make-qt == 'true' }}
-        run: apt-get install -y --no-install-recommends qtbase5-dev qttools5-dev
+        run: apt-get install -y --no-install-recommends qtbase5-dev libqt5svg5-dev qttools5-dev
       - name: Get Source
         uses: actions/download-artifact@v3
         with:
@@ -607,7 +607,7 @@ jobs:
         run: dnf install -y glibmm2.68-devel gtkmm4.0-devel
       - name: Get Dependencies (Qt)
         if: ${{ needs.what-to-make.outputs.make-qt == 'true' }}
-        run: dnf install -y qt6-qtbase-devel qt6-qttools-devel
+        run: dnf install -y qt6-qtbase-devel qt6-qtsvg-devel qt6-qttools-devel
       - name: Get Source
         uses: actions/download-artifact@v3
         with:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 758e1b57b..df0fe4db9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -318,7 +318,7 @@ if(ENABLE_QT)
     set(ENABLE_QT_COM_INTEROP OFF)
     set(ENABLE_QT_DBUS_INTEROP OFF)
 
-    set(QT_REQUIRED_MODULES Core Gui Widgets Network LinguistTools)
+    set(QT_REQUIRED_MODULES Core Gui Widgets Network Svg LinguistTools)
     set(QT_OPTIONAL_MODULES DBus AxContainer AxServer)
     set(MISSING_QT_MODULE)
 
diff --git a/dist/msi/CMakeLists.txt b/dist/msi/CMakeLists.txt
index bab65c14f..9d19d0da5 100644
--- a/dist/msi/CMakeLists.txt
+++ b/dist/msi/CMakeLists.txt
@@ -56,7 +56,6 @@ else()
     set(TR_OPENSSL_SSL_NAME "ssleay32.dll")
 endif()
 
-set(ICONS_DIR "${CMAKE_SOURCE_DIR}/qt/icons/hicolor")
 file(COPY "${CMAKE_SOURCE_DIR}/qt/icons/transmission.ico" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 set(WEBSRCDIR "${CMAKE_INSTALL_PREFIX}/share/transmission/public_html")