summarylogtreecommitdiffstats
path: root/qt-dir.patch
diff options
context:
space:
mode:
authorAli Molaei2023-11-15 13:41:33 +0330
committerAli Molaei2023-11-15 13:41:33 +0330
commit267a04c4daaecc8d0d41dddef99ab09c01b825c4 (patch)
tree6c4da185883a63b291f9f556481e85b8cf3ccb31 /qt-dir.patch
parent56056066a2347b325131702e6bde32a015586d85 (diff)
downloadaur-267a04c4daaecc8d0d41dddef99ab09c01b825c4.tar.gz
Fix gitignore
Diffstat (limited to 'qt-dir.patch')
-rw-r--r--qt-dir.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/qt-dir.patch b/qt-dir.patch
new file mode 100644
index 000000000000..4c4045c6eee1
--- /dev/null
+++ b/qt-dir.patch
@@ -0,0 +1,21 @@
+From: Ben Westover <me@benthetechguy.net>
+$QT_DIR is set to the Qt install prefix, which works fine for bundled Qt,
+but we're using a system Qt install, so everything is spread out. Correct
+the path to the qml and plugin directories for a system install.
+---
+
+diff --git a/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake b/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake
+index 10e1ea16..8a116690 100644
+--- a/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake
++++ b/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake
+@@ -22,8 +22,8 @@ cmake_minimum_required(VERSION 3.22)
+ #*****************************************************************************************************************************************************
+
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_BINDIR}" "${CMAKE_INSTALL_LIBDIR}" "." "../lib")
+-install(DIRECTORY "${QT_DIR}/qml" "${QT_DIR}/plugins"
+- DESTINATION "${CMAKE_INSTALL_PREFIX}")
++install(DIRECTORY "${QT_DIR}/lib/qt6/qml" "${QT_DIR}/lib/qt6/plugins"
++ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/qt6")
+
+ macro( AppendLib LIB_NAME HINT_PATH)
+ string(TOUPPER ${LIB_NAME} UP_NAME)