From c602f2493af67449e01502e595e0bf63408b5b48 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 3 Apr 2020 12:23:21 +0200 Subject: [PATCH] [keyboardq] Make QML available - name default / example QML conventionally - copy QRC from keyboard -- the QML needs to be included in the QRC -- since we don't want to have the QML in the keyboard module. --- src/modules/keyboardq/CMakeLists.txt | 2 +- src/modules/keyboardq/{keyboard.qml => keyboardq.qml} | 0 src/modules/keyboardq/keyboardq.qrc | 7 +++++++ 3 files changed, 8 insertions(+), 1 deletion(-) rename src/modules/keyboardq/{keyboard.qml => keyboardq.qml} (100%) create mode 100644 src/modules/keyboardq/keyboardq.qrc diff --git a/src/modules/keyboardq/CMakeLists.txt b/src/modules/keyboardq/CMakeLists.txt index f2565fc1c..f5fd2b64b 100644 --- a/src/modules/keyboardq/CMakeLists.txt +++ b/src/modules/keyboardq/CMakeLists.txt @@ -12,7 +12,7 @@ calamares_add_plugin( keyboardq ${_keyboard}/SetKeyboardLayoutJob.cpp ${_keyboard}/keyboardwidget/keyboardglobal.cpp RESOURCES - ${_keyboard}/keyboard.qrc + keyboardq.qrc LINK_PRIVATE_LIBRARIES calamaresui SHARED_LIB diff --git a/src/modules/keyboardq/keyboard.qml b/src/modules/keyboardq/keyboardq.qml similarity index 100% rename from src/modules/keyboardq/keyboard.qml rename to src/modules/keyboardq/keyboardq.qml diff --git a/src/modules/keyboardq/keyboardq.qrc b/src/modules/keyboardq/keyboardq.qrc new file mode 100644 index 000000000..492f6e213 --- /dev/null +++ b/src/modules/keyboardq/keyboardq.qrc @@ -0,0 +1,7 @@ + + + ../keyboard/kbd-model-map + ../keyboard/images/restore.png + keyboardq.qml + +