From 6d1a7c613b90fa8e79c05029a6d668bfaa37eadf Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Sat, 22 Jul 2023 11:04:27 +0200 Subject: [PATCH] Fix PluginInfoPage not being able to be displayed in Qt6 --- app/CMakeLists.txt | 1 + app/qml/PluginInfoPage.qml | 2 +- app/resources.qrc.in | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 76f936434..6068945e4 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -1,6 +1,7 @@ configure_file(qml/main.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/main.qml) configure_file(qml/DevicePage.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/DevicePage.qml) configure_file(qml/FindDevicesPage.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/FindDevicesPage.qml) +configure_file(qml/PluginInfoPage.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/PluginInfoPage.qml) configure_file(resources.qrc.in ${CMAKE_CURRENT_SOURCE_DIR}/resources.generated.qrc) qt_add_resources(kdeconnect_SRCS resources.generated.qrc) diff --git a/app/qml/PluginInfoPage.qml b/app/qml/PluginInfoPage.qml index a83e56e75..6ea534f4d 100644 --- a/app/qml/PluginInfoPage.qml +++ b/app/qml/PluginInfoPage.qml @@ -12,7 +12,7 @@ Kirigami.Page { property string configFile property string device - actions.main: loader.item && loader.item.action ? loader.item.action : null + @KIRIGAMI_PAGE_ACTIONS@: loader.item && loader.item.action ? loader.item.action : null onConfigFileChanged: loader.setSource(configFile, { device: root.device diff --git a/app/resources.qrc.in b/app/resources.qrc.in index 2761215b4..66ef1f2ab 100644 --- a/app/resources.qrc.in +++ b/app/resources.qrc.in @@ -12,7 +12,7 @@ qml/volume.qml qml/MprisSlider.qml qml/PluginSettings.qml - qml/PluginInfoPage.qml + @CMAKE_CURRENT_BINARY_DIR@/qml/PluginInfoPage.qml qml/Settings.qml