Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update qt cmakelists to include support for building svg (#4437)

Browse Source
This commit is contained in:
Gary Elshaw
2022-12-28 06:18:51 +13:00
committed by GitHub
parent a89b181f2c
commit 84566d42f0
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/actions.yml vendored
View File

@@ -262,7 +262,7 @@ jobs:
run: apk add --upgrade glibmm-dev gtkmm3-dev run: apk add --upgrade glibmm-dev gtkmm3-dev
- name: Get Dependencies (Qt) - name: Get Dependencies (Qt)
if: ${{ needs.what-to-make.outputs.make-qt == 'true' }} 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 - name: Get Source
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
@@ -534,7 +534,7 @@ jobs:
run: apt-get install -y --no-install-recommends libglibmm-2.4-dev libgtkmm-3.0-dev run: apt-get install -y --no-install-recommends libglibmm-2.4-dev libgtkmm-3.0-dev
- name: Get Dependencies (Qt) - name: Get Dependencies (Qt)
if: ${{ needs.what-to-make.outputs.make-qt == 'true' }} 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 - name: Get Source
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:
@@ -607,7 +607,7 @@ jobs:
run: dnf install -y glibmm2.68-devel gtkmm4.0-devel run: dnf install -y glibmm2.68-devel gtkmm4.0-devel
- name: Get Dependencies (Qt) - name: Get Dependencies (Qt)
if: ${{ needs.what-to-make.outputs.make-qt == 'true' }} 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 - name: Get Source
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:

2
CMakeLists.txt
View File

@@ -318,7 +318,7 @@ if(ENABLE_QT)
set(ENABLE_QT_COM_INTEROP OFF) set(ENABLE_QT_COM_INTEROP OFF)
set(ENABLE_QT_DBUS_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(QT_OPTIONAL_MODULES DBus AxContainer AxServer)
set(MISSING_QT_MODULE) set(MISSING_QT_MODULE)

1
dist/msi/CMakeLists.txt vendored
View File

@@ -56,7 +56,6 @@ else()
set(TR_OPENSSL_SSL_NAME "ssleay32.dll") set(TR_OPENSSL_SSL_NAME "ssleay32.dll")
endif() endif()
set(ICONS_DIR "${CMAKE_SOURCE_DIR}/qt/icons/hicolor")
file(COPY "${CMAKE_SOURCE_DIR}/qt/icons/transmission.ico" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) file(COPY "${CMAKE_SOURCE_DIR}/qt/icons/transmission.ico" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
set(WEBSRCDIR "${CMAKE_INSTALL_PREFIX}/share/transmission/public_html") set(WEBSRCDIR "${CMAKE_INSTALL_PREFIX}/share/transmission/public_html")