From eabb280d9cb3a805fb7ceb8ccf8628cf32de87df Mon Sep 17 00:00:00 2001
From: Alexander Lohnau <alexander.lohnau@gmx.de>
Date: Sat, 22 Jul 2023 11:07:27 +0200
Subject: [PATCH] Fix runcommand page not being able to be displayed in Qt6

---
 app/CMakeLists.txt     | 1 +
 app/qml/runcommand.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 6068945e4..74c914006 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -2,6 +2,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(qml/runcommand.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/runcommand.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/runcommand.qml b/app/qml/runcommand.qml
index bd82bee2c..f2fde7b23 100644
--- a/app/qml/runcommand.qml
+++ b/app/qml/runcommand.qml
@@ -16,7 +16,7 @@ Kirigami.ScrollablePage
     title: i18nd("kdeconnect-app", "Run command")
     property QtObject pluginInterface
 
-    actions.main: Kirigami.Action {
+    @KIGIGAMI_PAGE_ACTIONS@: Kirigami.Action {
         icon.name: "document-edit"
         text: i18nd("kdeconnect-app", "Edit commands")
         onTriggered: {
diff --git a/app/resources.qrc.in b/app/resources.qrc.in
index 66ef1f2ab..97bfa1bfc 100644
--- a/app/resources.qrc.in
+++ b/app/resources.qrc.in
@@ -8,7 +8,7 @@
     <file>qml/PluginItem.qml</file>
     <file alias="qml/DevicePage.qml">@CMAKE_CURRENT_BINARY_DIR@/qml/DevicePage.qml</file>
     <file alias="qml/FindDevicesPage.qml">@CMAKE_CURRENT_BINARY_DIR@/qml/FindDevicesPage.qml</file>
-    <file>qml/runcommand.qml</file>
+    <file alias="qml/runcommand.qml">@CMAKE_CURRENT_BINARY_DIR@/qml/runcommand.qml</file>
     <file>qml/volume.qml</file>
     <file>qml/MprisSlider.qml</file>
     <file>qml/PluginSettings.qml</file>