From 5ca6ebc2f9ddf2119524a9c91dc978504a27266a Mon Sep 17 00:00:00 2001 From: reionwong Date: Thu, 3 Sep 2026 22:54:48 -0400 Subject: [PATCH] refactor(cmake): reorganize framework modules --- CMakeLists.txt | 26 ++++++++++-- README.md | 17 ++++++++ accounts/CMakeLists.txt | 24 +++++++---- accounts/qmldir | 2 - appearance/CMakeLists.txt | 29 +++++++++++++ {system => appearance}/plugin.cpp | 0 {system => appearance}/wallpaper.cpp | 0 {system => appearance}/wallpaper.h | 0 applications/CMakeLists.txt | 10 ++--- audio/CMakeLists.txt | 27 ++++++++---- audio/{qml => }/PulseObjectFilterModel.qml | 0 audio/qml/qmldir | 4 -- bluetooth/CMakeLists.txt | 41 +++++++++++++++++++ {bluez => bluetooth}/DevicesModel.qml | 6 +-- .../applet/bluetoothagent.cpp | 0 {bluez => bluetooth}/applet/bluetoothagent.h | 0 .../applet/bluetoothmanager.cpp | 0 .../applet/bluetoothmanager.h | 0 .../applet/devicesproxymodel.cpp | 0 .../applet/devicesproxymodel.h | 0 .../bluezqtextensionplugin.cpp | 2 +- {bluez => bluetooth}/bluezqtextensionplugin.h | 2 +- {bluez => bluetooth}/declarativeadapter.cpp | 0 {bluez => bluetooth}/declarativeadapter.h | 0 {bluez => bluetooth}/declarativebattery.cpp | 0 {bluez => bluetooth}/declarativebattery.h | 0 {bluez => bluetooth}/declarativedevice.cpp | 0 {bluez => bluetooth}/declarativedevice.h | 0 .../declarativedevicesmodel.cpp | 0 .../declarativedevicesmodel.h | 0 {bluez => bluetooth}/declarativeinput.cpp | 0 {bluez => bluetooth}/declarativeinput.h | 0 {bluez => bluetooth}/declarativemanager.cpp | 0 {bluez => bluetooth}/declarativemanager.h | 0 .../declarativemediaplayer.cpp | 0 {bluez => bluetooth}/declarativemediaplayer.h | 0 bluez/CMakeLists.txt | 30 -------------- bluez/qmldir | 4 -- {mpris => media}/CMakeLists.txt | 20 ++++++--- {mpris => media}/mpris.cpp | 0 {mpris => media}/mpris.h | 0 {mpris => media}/mpriscontroller.cpp | 0 {mpris => media}/mpriscontroller.h | 0 {mpris => media}/mpriscontroller_p.h | 0 {mpris => media}/mprismanager.cpp | 0 {mpris => media}/mprismanager.h | 0 {mpris => media}/mprisplayer.cpp | 0 {mpris => media}/mprisplayer.h | 0 {mpris => media}/mprisplayer_p.h | 0 {mpris => media}/mprisplayeradaptor.cpp | 0 {mpris => media}/mprisplayerinterface.cpp | 0 {mpris => media}/mprisqt.h | 0 {mpris => media}/mprisrootadaptor.cpp | 0 {mpris => media}/mprisrootinterface.cpp | 0 .../org.mpris.MediaPlayer2.Player.xml | 0 {mpris => media}/org.mpris.MediaPlayer2.xml | 0 {mpris => media}/qmlplugins.cpp | 0 .../qtdbusextended/dbusextended.h | 0 .../dbusextendedabstractinterface.cpp | 0 .../dbusextendedabstractinterface.h | 0 .../dbusextendedpendingcallwatcher.cpp | 0 .../dbusextendedpendingcallwatcher_p.h | 0 mpris/qmldir | 2 - {networkmanagement => network}/CMakeLists.txt | 22 +++++++--- .../activeconnection.cpp | 0 .../activeconnection.h | 0 .../appletproxymodel.cpp | 0 .../appletproxymodel.h | 0 .../configuration.cpp | 0 .../configuration.h | 0 .../enabledconnections.cpp | 0 .../enabledconnections.h | 0 {networkmanagement => network}/enums.cpp | 0 {networkmanagement => network}/enums.h | 0 {networkmanagement => network}/handler.cpp | 0 {networkmanagement => network}/handler.h | 0 .../identitymodel.cpp | 0 .../identitymodel.h | 0 .../networkitemslist.cpp | 0 .../networkitemslist.h | 0 .../networkmodel.cpp | 0 {networkmanagement => network}/networkmodel.h | 0 .../networkmodelitem.cpp | 0 .../networkmodelitem.h | 0 {networkmanagement => network}/qmlplugins.cpp | 0 {networkmanagement => network}/qmlplugins.h | 0 {networkmanagement => network}/uiutils.cpp | 0 {networkmanagement => network}/uiutils.h | 0 .../wifisettings.cpp | 0 {networkmanagement => network}/wifisettings.h | 0 .../wiressitemsettings.cpp | 0 .../wiressitemsettings.h | 0 networkmanagement/qmldir | 3 -- screen/CMakeLists.txt | 25 ++++++----- screen/qmldir | 3 -- system/CMakeLists.txt | 19 --------- system/qmldir | 3 -- 97 files changed, 199 insertions(+), 122 deletions(-) delete mode 100644 accounts/qmldir create mode 100644 appearance/CMakeLists.txt rename {system => appearance}/plugin.cpp (100%) rename {system => appearance}/wallpaper.cpp (100%) rename {system => appearance}/wallpaper.h (100%) rename audio/{qml => }/PulseObjectFilterModel.qml (100%) delete mode 100644 audio/qml/qmldir create mode 100644 bluetooth/CMakeLists.txt rename {bluez => bluetooth}/DevicesModel.qml (61%) rename {bluez => bluetooth}/applet/bluetoothagent.cpp (100%) rename {bluez => bluetooth}/applet/bluetoothagent.h (100%) rename {bluez => bluetooth}/applet/bluetoothmanager.cpp (100%) rename {bluez => bluetooth}/applet/bluetoothmanager.h (100%) rename {bluez => bluetooth}/applet/devicesproxymodel.cpp (100%) rename {bluez => bluetooth}/applet/devicesproxymodel.h (100%) rename {bluez => bluetooth}/bluezqtextensionplugin.cpp (98%) rename {bluez => bluetooth}/bluezqtextensionplugin.h (91%) rename {bluez => bluetooth}/declarativeadapter.cpp (100%) rename {bluez => bluetooth}/declarativeadapter.h (100%) rename {bluez => bluetooth}/declarativebattery.cpp (100%) rename {bluez => bluetooth}/declarativebattery.h (100%) rename {bluez => bluetooth}/declarativedevice.cpp (100%) rename {bluez => bluetooth}/declarativedevice.h (100%) rename {bluez => bluetooth}/declarativedevicesmodel.cpp (100%) rename {bluez => bluetooth}/declarativedevicesmodel.h (100%) rename {bluez => bluetooth}/declarativeinput.cpp (100%) rename {bluez => bluetooth}/declarativeinput.h (100%) rename {bluez => bluetooth}/declarativemanager.cpp (100%) rename {bluez => bluetooth}/declarativemanager.h (100%) rename {bluez => bluetooth}/declarativemediaplayer.cpp (100%) rename {bluez => bluetooth}/declarativemediaplayer.h (100%) delete mode 100644 bluez/CMakeLists.txt delete mode 100644 bluez/qmldir rename {mpris => media}/CMakeLists.txt (56%) rename {mpris => media}/mpris.cpp (100%) rename {mpris => media}/mpris.h (100%) rename {mpris => media}/mpriscontroller.cpp (100%) rename {mpris => media}/mpriscontroller.h (100%) rename {mpris => media}/mpriscontroller_p.h (100%) rename {mpris => media}/mprismanager.cpp (100%) rename {mpris => media}/mprismanager.h (100%) rename {mpris => media}/mprisplayer.cpp (100%) rename {mpris => media}/mprisplayer.h (100%) rename {mpris => media}/mprisplayer_p.h (100%) rename {mpris => media}/mprisplayeradaptor.cpp (100%) rename {mpris => media}/mprisplayerinterface.cpp (100%) rename {mpris => media}/mprisqt.h (100%) rename {mpris => media}/mprisrootadaptor.cpp (100%) rename {mpris => media}/mprisrootinterface.cpp (100%) rename {mpris => media}/org.mpris.MediaPlayer2.Player.xml (100%) rename {mpris => media}/org.mpris.MediaPlayer2.xml (100%) rename {mpris => media}/qmlplugins.cpp (100%) rename {mpris => media}/qtdbusextended/dbusextended.h (100%) rename {mpris => media}/qtdbusextended/dbusextendedabstractinterface.cpp (100%) rename {mpris => media}/qtdbusextended/dbusextendedabstractinterface.h (100%) rename {mpris => media}/qtdbusextended/dbusextendedpendingcallwatcher.cpp (100%) rename {mpris => media}/qtdbusextended/dbusextendedpendingcallwatcher_p.h (100%) delete mode 100644 mpris/qmldir rename {networkmanagement => network}/CMakeLists.txt (55%) rename {networkmanagement => network}/activeconnection.cpp (100%) rename {networkmanagement => network}/activeconnection.h (100%) rename {networkmanagement => network}/appletproxymodel.cpp (100%) rename {networkmanagement => network}/appletproxymodel.h (100%) rename {networkmanagement => network}/configuration.cpp (100%) rename {networkmanagement => network}/configuration.h (100%) rename {networkmanagement => network}/enabledconnections.cpp (100%) rename {networkmanagement => network}/enabledconnections.h (100%) rename {networkmanagement => network}/enums.cpp (100%) rename {networkmanagement => network}/enums.h (100%) rename {networkmanagement => network}/handler.cpp (100%) rename {networkmanagement => network}/handler.h (100%) rename {networkmanagement => network}/identitymodel.cpp (100%) rename {networkmanagement => network}/identitymodel.h (100%) rename {networkmanagement => network}/networkitemslist.cpp (100%) rename {networkmanagement => network}/networkitemslist.h (100%) rename {networkmanagement => network}/networkmodel.cpp (100%) rename {networkmanagement => network}/networkmodel.h (100%) rename {networkmanagement => network}/networkmodelitem.cpp (100%) rename {networkmanagement => network}/networkmodelitem.h (100%) rename {networkmanagement => network}/qmlplugins.cpp (100%) rename {networkmanagement => network}/qmlplugins.h (100%) rename {networkmanagement => network}/uiutils.cpp (100%) rename {networkmanagement => network}/uiutils.h (100%) rename {networkmanagement => network}/wifisettings.cpp (100%) rename {networkmanagement => network}/wifisettings.h (100%) rename {networkmanagement => network}/wiressitemsettings.cpp (100%) rename {networkmanagement => network}/wiressitemsettings.h (100%) delete mode 100644 networkmanagement/qmldir delete mode 100644 screen/qmldir delete mode 100644 system/CMakeLists.txt delete mode 100644 system/qmldir diff --git a/CMakeLists.txt b/CMakeLists.txt index ba24fc1..6c23675 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,24 @@ find_package(Qt6 REQUIRED COMPONENTS Qml ) +qt_policy(SET QTP0001 NEW) + +function(cutefish_install_qml_module target) + qt_query_qml_module("${target}" + TARGET_PATH module_path + QMLDIR module_qmldir + TYPEINFO module_qmltypes + ) + + set(module_install_dir "${INSTALL_QMLDIR}/${module_path}") + install(TARGETS "${target}" DESTINATION "${module_install_dir}") + install(FILES "${module_qmldir}" DESTINATION "${module_install_dir}") + + if(module_qmltypes) + install(FILES "${module_qmltypes}" DESTINATION "${module_install_dir}") + endif() +endfunction() + # Get the installation directory from Qt 6 find_program(QT_PATHS_EXECUTABLE NAMES qtpaths6 REQUIRED) @@ -41,9 +59,9 @@ endif() add_subdirectory(applications) add_subdirectory(accounts) -add_subdirectory(bluez) -add_subdirectory(mpris) -add_subdirectory(networkmanagement) +add_subdirectory(bluetooth) +add_subdirectory(media) +add_subdirectory(network) add_subdirectory(screen) -add_subdirectory(system) +add_subdirectory(appearance) add_subdirectory(audio) diff --git a/README.md b/README.md index 53b2f6f..b461953 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,23 @@ It provides common access to application metadata, networking, Bluetooth, audio, display, appearance, accounts, media controls, and other desktop services. +## Components + +The framework provides these CMake targets and C++ aliases: + +- `cutefish-framework-applications` / `Cutefish::Applications` +- `cutefish-framework-accounts` / `Cutefish::Accounts` +- `cutefish-framework-audio` / `Cutefish::Audio` +- `cutefish-framework-appearance` / `Cutefish::Appearance` +- `cutefish-framework-bluetooth` / `Cutefish::Bluetooth` +- `cutefish-framework-media` / `Cutefish::Media` +- `cutefish-framework-network` / `Cutefish::Network` +- `cutefish-framework-screen` / `Cutefish::Screen` + +The QML modules are `Cutefish.Accounts`, `Cutefish.Appearance`, +`Cutefish.Audio`, `Cutefish.Bluetooth`, `Cutefish.Media`, +`Cutefish.Network`, and `Cutefish.Screen`. + ## Dependencies The framework uses Qt 6, KDE Frameworks 6, and a C++20 compiler. diff --git a/accounts/CMakeLists.txt b/accounts/CMakeLists.txt index bac8c09..fe3f607 100644 --- a/accounts/CMakeLists.txt +++ b/accounts/CMakeLists.txt @@ -1,6 +1,6 @@ find_package(Qt6 REQUIRED COMPONENTS Core DBus Gui Quick) -set(ACCOUNTS_SRCS +set(CUTEFISH_ACCOUNTS_SOURCES accountsmanager.cpp accountsmanager.h accountsmanager_p.h @@ -13,23 +13,31 @@ set(ACCOUNTS_SRCS qmlplugins.cpp ) -qt6_add_dbus_interface(ACCOUNTS_SRCS +qt6_add_dbus_interface(CUTEFISH_ACCOUNTS_SOURCES org.freedesktop.Accounts.User.xml user_interface) -qt6_add_dbus_interface(ACCOUNTS_SRCS +qt6_add_dbus_interface(CUTEFISH_ACCOUNTS_SOURCES org.freedesktop.Accounts.xml accounts_interface) -# set_source_files_properties(${ACCOUNTS_SRCS} PROPERTIES SKIP_AUTOGEN ON) +add_library(cutefish-framework-accounts SHARED ${CUTEFISH_ACCOUNTS_SOURCES}) -add_library(cutefishaccounts_qmlplugins SHARED ${ACCOUNTS_SRCS}) +qt_add_qml_module(cutefish-framework-accounts + URI Cutefish.Accounts + VERSION 1.0 + PLUGIN_TARGET cutefish-framework-accounts + CLASS_NAME QmlPlugins + NO_GENERATE_PLUGIN_SOURCE + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Cutefish/Accounts" +) + +add_library(Cutefish::Accounts ALIAS cutefish-framework-accounts) -target_link_libraries (cutefishaccounts_qmlplugins +target_link_libraries(cutefish-framework-accounts PUBLIC Qt6::Core Qt6::DBus Qt6::Quick Qt6::Gui ) -install(TARGETS cutefishaccounts_qmlplugins DESTINATION ${INSTALL_QMLDIR}/Cutefish/Accounts) -install(FILES qmldir DESTINATION ${INSTALL_QMLDIR}/Cutefish/Accounts) +cutefish_install_qml_module(cutefish-framework-accounts) diff --git a/accounts/qmldir b/accounts/qmldir deleted file mode 100644 index 8507f55..0000000 --- a/accounts/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -module Cutefish.Accounts -plugin cutefishaccounts_qmlplugins \ No newline at end of file diff --git a/appearance/CMakeLists.txt b/appearance/CMakeLists.txt new file mode 100644 index 0000000..bf919a0 --- /dev/null +++ b/appearance/CMakeLists.txt @@ -0,0 +1,29 @@ +set(CUTEFISH_APPEARANCE_SOURCES + wallpaper.cpp + wallpaper.h + plugin.cpp +) + +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick DBus) + +add_library(cutefish-framework-appearance SHARED ${CUTEFISH_APPEARANCE_SOURCES}) + +qt_add_qml_module(cutefish-framework-appearance + URI Cutefish.Appearance + VERSION 1.0 + PLUGIN_TARGET cutefish-framework-appearance + CLASS_NAME QmlPlugins + NO_GENERATE_PLUGIN_SOURCE + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Cutefish/Appearance" +) + +add_library(Cutefish::Appearance ALIAS cutefish-framework-appearance) + +target_link_libraries(cutefish-framework-appearance PUBLIC + Qt6::Core + Qt6::Quick + Qt6::Gui + Qt6::DBus +) + +cutefish_install_qml_module(cutefish-framework-appearance) diff --git a/system/plugin.cpp b/appearance/plugin.cpp similarity index 100% rename from system/plugin.cpp rename to appearance/plugin.cpp diff --git a/system/wallpaper.cpp b/appearance/wallpaper.cpp similarity index 100% rename from system/wallpaper.cpp rename to appearance/wallpaper.cpp diff --git a/system/wallpaper.h b/appearance/wallpaper.h similarity index 100% rename from system/wallpaper.h rename to appearance/wallpaper.h diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt index c0387a6..427c39f 100644 --- a/applications/CMakeLists.txt +++ b/applications/CMakeLists.txt @@ -9,12 +9,12 @@ set(CUTEFISH_APPLICATIONS_SRCS desktopentry.h ) -add_library(cutefishapplications STATIC ${CUTEFISH_APPLICATIONS_SRCS}) -set_target_properties(cutefishapplications PROPERTIES POSITION_INDEPENDENT_CODE ON) -set_target_properties(cutefishapplications PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON) +add_library(cutefish-framework-applications STATIC ${CUTEFISH_APPLICATIONS_SRCS}) +add_library(Cutefish::Applications ALIAS cutefish-framework-applications) +set_target_properties(cutefish-framework-applications PROPERTIES POSITION_INDEPENDENT_CODE ON) -target_include_directories(cutefishapplications PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(cutefishapplications +target_include_directories(cutefish-framework-applications PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(cutefish-framework-applications PUBLIC Qt6::Core Qt6::DBus diff --git a/audio/CMakeLists.txt b/audio/CMakeLists.txt index 20feff3..6ae0ccf 100644 --- a/audio/CMakeLists.txt +++ b/audio/CMakeLists.txt @@ -7,7 +7,7 @@ set(USE_GCONF False) configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) -set(audio_SRCS +set(CUTEFISH_AUDIO_SOURCES card.cpp client.cpp context.cpp @@ -41,9 +41,8 @@ set(audio_SRCS model/sortfiltermodel.cpp ) -set(qml_SRCS - qml/qmldir - qml/PulseObjectFilterModel.qml +set(CUTEFISH_AUDIO_QML_FILES + PulseObjectFilterModel.qml ) find_package(PkgConfig) @@ -67,9 +66,21 @@ set_package_properties(SoundThemeFreedesktop PROPERTIES pkg_check_modules(LIBPULSE libpulse REQUIRED IMPORTED_TARGET) pkg_check_modules(LIBPULSE_MAINLOOP libpulse-mainloop-glib REQUIRED IMPORTED_TARGET) -add_library(cutefishaudio_qmlplugins SHARED ${audio_SRCS}) +add_library(cutefish-framework-audio SHARED ${CUTEFISH_AUDIO_SOURCES}) -target_link_libraries(cutefishaudio_qmlplugins +qt_add_qml_module(cutefish-framework-audio + URI Cutefish.Audio + VERSION 1.0 + PLUGIN_TARGET cutefish-framework-audio + CLASS_NAME Plugin + NO_GENERATE_PLUGIN_SOURCE + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Cutefish/Audio" + QML_FILES ${CUTEFISH_AUDIO_QML_FILES} +) + +add_library(Cutefish::Audio ALIAS cutefish-framework-audio) + +target_link_libraries(cutefish-framework-audio PUBLIC Qt6::Core Qt6::Qml Qt6::Gui @@ -81,5 +92,5 @@ target_link_libraries(cutefishaudio_qmlplugins PkgConfig::LIBPULSE_MAINLOOP ) -install(TARGETS cutefishaudio_qmlplugins DESTINATION ${INSTALL_QMLDIR}/Cutefish/Audio) -install(FILES ${qml_SRCS} DESTINATION ${INSTALL_QMLDIR}/Cutefish/Audio) +cutefish_install_qml_module(cutefish-framework-audio) +install(FILES ${CUTEFISH_AUDIO_QML_FILES} DESTINATION ${INSTALL_QMLDIR}/Cutefish/Audio) diff --git a/audio/qml/PulseObjectFilterModel.qml b/audio/PulseObjectFilterModel.qml similarity index 100% rename from audio/qml/PulseObjectFilterModel.qml rename to audio/PulseObjectFilterModel.qml diff --git a/audio/qml/qmldir b/audio/qml/qmldir deleted file mode 100644 index 81695c8..0000000 --- a/audio/qml/qmldir +++ /dev/null @@ -1,4 +0,0 @@ -module Cutefish.Audio -plugin cutefishaudio_qmlplugins - -PulseObjectFilterModel 1.0 PulseObjectFilterModel.qml diff --git a/bluetooth/CMakeLists.txt b/bluetooth/CMakeLists.txt new file mode 100644 index 0000000..f973610 --- /dev/null +++ b/bluetooth/CMakeLists.txt @@ -0,0 +1,41 @@ +find_package(Qt6 REQUIRED COMPONENTS Core DBus Qml) + +set(CUTEFISH_BLUETOOTH_SOURCES + declarativemanager.cpp + declarativeadapter.cpp + # declarativebattery.cpp + declarativedevice.cpp + declarativeinput.cpp + declarativemediaplayer.cpp + declarativedevicesmodel.cpp + bluezqtextensionplugin.cpp + applet/devicesproxymodel.cpp + applet/bluetoothagent.cpp + applet/bluetoothmanager.cpp +) + +add_library(cutefish-framework-bluetooth SHARED ${CUTEFISH_BLUETOOTH_SOURCES}) + +find_package(KF6BluezQt REQUIRED) + +qt_add_qml_module(cutefish-framework-bluetooth + URI Cutefish.Bluetooth + VERSION 1.0 + PLUGIN_TARGET cutefish-framework-bluetooth + CLASS_NAME BluezQtExtensionPlugin + NO_GENERATE_PLUGIN_SOURCE + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Cutefish/Bluetooth" + QML_FILES DevicesModel.qml +) + +add_library(Cutefish::Bluetooth ALIAS cutefish-framework-bluetooth) + +target_link_libraries(cutefish-framework-bluetooth PUBLIC + Qt6::Core + Qt6::Qml + Qt6::DBus + KF6::BluezQt +) + +cutefish_install_qml_module(cutefish-framework-bluetooth) +install(FILES DevicesModel.qml DESTINATION ${INSTALL_QMLDIR}/Cutefish/Bluetooth) diff --git a/bluez/DevicesModel.qml b/bluetooth/DevicesModel.qml similarity index 61% rename from bluez/DevicesModel.qml rename to bluetooth/DevicesModel.qml index 47ac35e..c923ce5 100644 --- a/bluez/DevicesModel.qml +++ b/bluetooth/DevicesModel.qml @@ -4,8 +4,8 @@ * SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ -import Cutefish.Bluez 1.0 as Bluez +import Cutefish.Bluetooth 1.0 as Bluetooth -Bluez.DevicesModelPrivate { - manager: Bluez.Manager +Bluetooth.DevicesModelPrivate { + manager: Bluetooth.Manager } diff --git a/bluez/applet/bluetoothagent.cpp b/bluetooth/applet/bluetoothagent.cpp similarity index 100% rename from bluez/applet/bluetoothagent.cpp rename to bluetooth/applet/bluetoothagent.cpp diff --git a/bluez/applet/bluetoothagent.h b/bluetooth/applet/bluetoothagent.h similarity index 100% rename from bluez/applet/bluetoothagent.h rename to bluetooth/applet/bluetoothagent.h diff --git a/bluez/applet/bluetoothmanager.cpp b/bluetooth/applet/bluetoothmanager.cpp similarity index 100% rename from bluez/applet/bluetoothmanager.cpp rename to bluetooth/applet/bluetoothmanager.cpp diff --git a/bluez/applet/bluetoothmanager.h b/bluetooth/applet/bluetoothmanager.h similarity index 100% rename from bluez/applet/bluetoothmanager.h rename to bluetooth/applet/bluetoothmanager.h diff --git a/bluez/applet/devicesproxymodel.cpp b/bluetooth/applet/devicesproxymodel.cpp similarity index 100% rename from bluez/applet/devicesproxymodel.cpp rename to bluetooth/applet/devicesproxymodel.cpp diff --git a/bluez/applet/devicesproxymodel.h b/bluetooth/applet/devicesproxymodel.h similarity index 100% rename from bluez/applet/devicesproxymodel.h rename to bluetooth/applet/devicesproxymodel.h diff --git a/bluez/bluezqtextensionplugin.cpp b/bluetooth/bluezqtextensionplugin.cpp similarity index 98% rename from bluez/bluezqtextensionplugin.cpp rename to bluetooth/bluezqtextensionplugin.cpp index e8c5ad0..f12eb37 100644 --- a/bluez/bluezqtextensionplugin.cpp +++ b/bluetooth/bluezqtextensionplugin.cpp @@ -66,7 +66,7 @@ void BluezQtExtensionPlugin::registerTypes(const char *uri) { using namespace BluezQt; - Q_ASSERT(QLatin1String(uri) == QLatin1String("Cutefish.Bluez")); + Q_ASSERT(QLatin1String(uri) == QLatin1String("Cutefish.Bluetooth")); qmlRegisterSingletonType(uri, 1, 0, "Manager", manager_singleton); qmlRegisterType(uri, 1, 0, "DevicesModelPrivate"); diff --git a/bluez/bluezqtextensionplugin.h b/bluetooth/bluezqtextensionplugin.h similarity index 91% rename from bluez/bluezqtextensionplugin.h rename to bluetooth/bluezqtextensionplugin.h index 75b90f8..71a56e0 100644 --- a/bluez/bluezqtextensionplugin.h +++ b/bluetooth/bluezqtextensionplugin.h @@ -14,7 +14,7 @@ class BluezQtExtensionPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "Cutefish.Bluez") + Q_PLUGIN_METADATA(IID "Cutefish.Bluetooth") public: void registerTypes(const char *uri) override; diff --git a/bluez/declarativeadapter.cpp b/bluetooth/declarativeadapter.cpp similarity index 100% rename from bluez/declarativeadapter.cpp rename to bluetooth/declarativeadapter.cpp diff --git a/bluez/declarativeadapter.h b/bluetooth/declarativeadapter.h similarity index 100% rename from bluez/declarativeadapter.h rename to bluetooth/declarativeadapter.h diff --git a/bluez/declarativebattery.cpp b/bluetooth/declarativebattery.cpp similarity index 100% rename from bluez/declarativebattery.cpp rename to bluetooth/declarativebattery.cpp diff --git a/bluez/declarativebattery.h b/bluetooth/declarativebattery.h similarity index 100% rename from bluez/declarativebattery.h rename to bluetooth/declarativebattery.h diff --git a/bluez/declarativedevice.cpp b/bluetooth/declarativedevice.cpp similarity index 100% rename from bluez/declarativedevice.cpp rename to bluetooth/declarativedevice.cpp diff --git a/bluez/declarativedevice.h b/bluetooth/declarativedevice.h similarity index 100% rename from bluez/declarativedevice.h rename to bluetooth/declarativedevice.h diff --git a/bluez/declarativedevicesmodel.cpp b/bluetooth/declarativedevicesmodel.cpp similarity index 100% rename from bluez/declarativedevicesmodel.cpp rename to bluetooth/declarativedevicesmodel.cpp diff --git a/bluez/declarativedevicesmodel.h b/bluetooth/declarativedevicesmodel.h similarity index 100% rename from bluez/declarativedevicesmodel.h rename to bluetooth/declarativedevicesmodel.h diff --git a/bluez/declarativeinput.cpp b/bluetooth/declarativeinput.cpp similarity index 100% rename from bluez/declarativeinput.cpp rename to bluetooth/declarativeinput.cpp diff --git a/bluez/declarativeinput.h b/bluetooth/declarativeinput.h similarity index 100% rename from bluez/declarativeinput.h rename to bluetooth/declarativeinput.h diff --git a/bluez/declarativemanager.cpp b/bluetooth/declarativemanager.cpp similarity index 100% rename from bluez/declarativemanager.cpp rename to bluetooth/declarativemanager.cpp diff --git a/bluez/declarativemanager.h b/bluetooth/declarativemanager.h similarity index 100% rename from bluez/declarativemanager.h rename to bluetooth/declarativemanager.h diff --git a/bluez/declarativemediaplayer.cpp b/bluetooth/declarativemediaplayer.cpp similarity index 100% rename from bluez/declarativemediaplayer.cpp rename to bluetooth/declarativemediaplayer.cpp diff --git a/bluez/declarativemediaplayer.h b/bluetooth/declarativemediaplayer.h similarity index 100% rename from bluez/declarativemediaplayer.h rename to bluetooth/declarativemediaplayer.h diff --git a/bluez/CMakeLists.txt b/bluez/CMakeLists.txt deleted file mode 100644 index 854a083..0000000 --- a/bluez/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -find_package(Qt6 REQUIRED COMPONENTS Core DBus Qml) - -set(bluezqtextensionplugin_SRCS - declarativemanager.cpp - declarativeadapter.cpp - # declarativebattery.cpp - declarativedevice.cpp - declarativeinput.cpp - declarativemediaplayer.cpp - declarativedevicesmodel.cpp - bluezqtextensionplugin.cpp - applet/devicesproxymodel.cpp - applet/bluetoothagent.cpp - applet/bluetoothmanager.cpp -) - -add_library(cutefishbluez_qmlplugins SHARED ${bluezqtextensionplugin_SRCS}) - -find_package(KF6BluezQt REQUIRED) - -target_link_libraries(cutefishbluez_qmlplugins - Qt6::Core - Qt6::Qml - Qt6::DBus - KF6::BluezQt -) - -install(TARGETS cutefishbluez_qmlplugins DESTINATION ${INSTALL_QMLDIR}/Cutefish/Bluez) -install(FILES DevicesModel.qml DESTINATION ${INSTALL_QMLDIR}/Cutefish/Bluez) -install(FILES qmldir DESTINATION ${INSTALL_QMLDIR}/Cutefish/Bluez) diff --git a/bluez/qmldir b/bluez/qmldir deleted file mode 100644 index 4b146e6..0000000 --- a/bluez/qmldir +++ /dev/null @@ -1,4 +0,0 @@ -module Cutefish.Bluez -plugin cutefishbluez_qmlplugins - -DevicesModel 1.0 DevicesModel.qml diff --git a/mpris/CMakeLists.txt b/media/CMakeLists.txt similarity index 56% rename from mpris/CMakeLists.txt rename to media/CMakeLists.txt index 1012eff..ecec52b 100644 --- a/mpris/CMakeLists.txt +++ b/media/CMakeLists.txt @@ -1,6 +1,6 @@ find_package(Qt6 REQUIRED COMPONENTS Core DBus Gui Quick) -set(NETWORKMGR_SRCS +set(CUTEFISH_MEDIA_SOURCES mpris.cpp mpris.h mpriscontroller_p.h @@ -24,14 +24,24 @@ set(NETWORKMGR_SRCS qtdbusextended/dbusextendedpendingcallwatcher.cpp ) -add_library(cutefishmpris_qmlplugins SHARED ${NETWORKMGR_SRCS}) +add_library(cutefish-framework-media SHARED ${CUTEFISH_MEDIA_SOURCES}) -target_link_libraries (cutefishmpris_qmlplugins +qt_add_qml_module(cutefish-framework-media + URI Cutefish.Media + VERSION 1.0 + PLUGIN_TARGET cutefish-framework-media + CLASS_NAME QmlPlugins + NO_GENERATE_PLUGIN_SOURCE + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Cutefish/Media" +) + +add_library(Cutefish::Media ALIAS cutefish-framework-media) + +target_link_libraries(cutefish-framework-media PUBLIC Qt6::Core Qt6::Quick Qt6::Gui Qt6::DBus ) -install(TARGETS cutefishmpris_qmlplugins DESTINATION ${INSTALL_QMLDIR}/Cutefish/Mpris) -install(FILES qmldir DESTINATION ${INSTALL_QMLDIR}/Cutefish/Mpris) +cutefish_install_qml_module(cutefish-framework-media) diff --git a/mpris/mpris.cpp b/media/mpris.cpp similarity index 100% rename from mpris/mpris.cpp rename to media/mpris.cpp diff --git a/mpris/mpris.h b/media/mpris.h similarity index 100% rename from mpris/mpris.h rename to media/mpris.h diff --git a/mpris/mpriscontroller.cpp b/media/mpriscontroller.cpp similarity index 100% rename from mpris/mpriscontroller.cpp rename to media/mpriscontroller.cpp diff --git a/mpris/mpriscontroller.h b/media/mpriscontroller.h similarity index 100% rename from mpris/mpriscontroller.h rename to media/mpriscontroller.h diff --git a/mpris/mpriscontroller_p.h b/media/mpriscontroller_p.h similarity index 100% rename from mpris/mpriscontroller_p.h rename to media/mpriscontroller_p.h diff --git a/mpris/mprismanager.cpp b/media/mprismanager.cpp similarity index 100% rename from mpris/mprismanager.cpp rename to media/mprismanager.cpp diff --git a/mpris/mprismanager.h b/media/mprismanager.h similarity index 100% rename from mpris/mprismanager.h rename to media/mprismanager.h diff --git a/mpris/mprisplayer.cpp b/media/mprisplayer.cpp similarity index 100% rename from mpris/mprisplayer.cpp rename to media/mprisplayer.cpp diff --git a/mpris/mprisplayer.h b/media/mprisplayer.h similarity index 100% rename from mpris/mprisplayer.h rename to media/mprisplayer.h diff --git a/mpris/mprisplayer_p.h b/media/mprisplayer_p.h similarity index 100% rename from mpris/mprisplayer_p.h rename to media/mprisplayer_p.h diff --git a/mpris/mprisplayeradaptor.cpp b/media/mprisplayeradaptor.cpp similarity index 100% rename from mpris/mprisplayeradaptor.cpp rename to media/mprisplayeradaptor.cpp diff --git a/mpris/mprisplayerinterface.cpp b/media/mprisplayerinterface.cpp similarity index 100% rename from mpris/mprisplayerinterface.cpp rename to media/mprisplayerinterface.cpp diff --git a/mpris/mprisqt.h b/media/mprisqt.h similarity index 100% rename from mpris/mprisqt.h rename to media/mprisqt.h diff --git a/mpris/mprisrootadaptor.cpp b/media/mprisrootadaptor.cpp similarity index 100% rename from mpris/mprisrootadaptor.cpp rename to media/mprisrootadaptor.cpp diff --git a/mpris/mprisrootinterface.cpp b/media/mprisrootinterface.cpp similarity index 100% rename from mpris/mprisrootinterface.cpp rename to media/mprisrootinterface.cpp diff --git a/mpris/org.mpris.MediaPlayer2.Player.xml b/media/org.mpris.MediaPlayer2.Player.xml similarity index 100% rename from mpris/org.mpris.MediaPlayer2.Player.xml rename to media/org.mpris.MediaPlayer2.Player.xml diff --git a/mpris/org.mpris.MediaPlayer2.xml b/media/org.mpris.MediaPlayer2.xml similarity index 100% rename from mpris/org.mpris.MediaPlayer2.xml rename to media/org.mpris.MediaPlayer2.xml diff --git a/mpris/qmlplugins.cpp b/media/qmlplugins.cpp similarity index 100% rename from mpris/qmlplugins.cpp rename to media/qmlplugins.cpp diff --git a/mpris/qtdbusextended/dbusextended.h b/media/qtdbusextended/dbusextended.h similarity index 100% rename from mpris/qtdbusextended/dbusextended.h rename to media/qtdbusextended/dbusextended.h diff --git a/mpris/qtdbusextended/dbusextendedabstractinterface.cpp b/media/qtdbusextended/dbusextendedabstractinterface.cpp similarity index 100% rename from mpris/qtdbusextended/dbusextendedabstractinterface.cpp rename to media/qtdbusextended/dbusextendedabstractinterface.cpp diff --git a/mpris/qtdbusextended/dbusextendedabstractinterface.h b/media/qtdbusextended/dbusextendedabstractinterface.h similarity index 100% rename from mpris/qtdbusextended/dbusextendedabstractinterface.h rename to media/qtdbusextended/dbusextendedabstractinterface.h diff --git a/mpris/qtdbusextended/dbusextendedpendingcallwatcher.cpp b/media/qtdbusextended/dbusextendedpendingcallwatcher.cpp similarity index 100% rename from mpris/qtdbusextended/dbusextendedpendingcallwatcher.cpp rename to media/qtdbusextended/dbusextendedpendingcallwatcher.cpp diff --git a/mpris/qtdbusextended/dbusextendedpendingcallwatcher_p.h b/media/qtdbusextended/dbusextendedpendingcallwatcher_p.h similarity index 100% rename from mpris/qtdbusextended/dbusextendedpendingcallwatcher_p.h rename to media/qtdbusextended/dbusextendedpendingcallwatcher_p.h diff --git a/mpris/qmldir b/mpris/qmldir deleted file mode 100644 index 46e6521..0000000 --- a/mpris/qmldir +++ /dev/null @@ -1,2 +0,0 @@ -module Cutefish.Mpris -plugin cutefishmpris_qmlplugins \ No newline at end of file diff --git a/networkmanagement/CMakeLists.txt b/network/CMakeLists.txt similarity index 55% rename from networkmanagement/CMakeLists.txt rename to network/CMakeLists.txt index cfbedbd..8e5fb5d 100644 --- a/networkmanagement/CMakeLists.txt +++ b/network/CMakeLists.txt @@ -1,6 +1,6 @@ find_package(Qt6 REQUIRED COMPONENTS Core DBus Gui Quick) -set(NETWORKMGR_SRCS +set(CUTEFISH_NETWORK_SOURCES appletproxymodel.cpp appletproxymodel.h @@ -47,10 +47,21 @@ set(NETWORKMGR_SRCS find_package(KF6NetworkManagerQt REQUIRED) find_package(KF6ModemManagerQt REQUIRED) -add_library(cutefishnm_qmlplugins SHARED ${NETWORKMGR_SRCS}) -generate_export_header(cutefishnm_qmlplugins EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/networkmanager_export.h BASE_NAME NetworkManager) +add_library(cutefish-framework-network SHARED ${CUTEFISH_NETWORK_SOURCES}) +generate_export_header(cutefish-framework-network EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/networkmanager_export.h BASE_NAME NetworkManager) -target_link_libraries (cutefishnm_qmlplugins +qt_add_qml_module(cutefish-framework-network + URI Cutefish.Network + VERSION 1.0 + PLUGIN_TARGET cutefish-framework-network + CLASS_NAME QmlPlugins + NO_GENERATE_PLUGIN_SOURCE + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Cutefish/Network" +) + +add_library(Cutefish::Network ALIAS cutefish-framework-network) + +target_link_libraries(cutefish-framework-network PUBLIC Qt6::Core Qt6::Quick Qt6::Gui @@ -60,5 +71,4 @@ target_link_libraries (cutefishnm_qmlplugins KF6::ModemManagerQt ) -install(TARGETS cutefishnm_qmlplugins DESTINATION ${INSTALL_QMLDIR}/Cutefish/NetworkManagement) -install(FILES qmldir DESTINATION ${INSTALL_QMLDIR}/Cutefish/NetworkManagement) +cutefish_install_qml_module(cutefish-framework-network) diff --git a/networkmanagement/activeconnection.cpp b/network/activeconnection.cpp similarity index 100% rename from networkmanagement/activeconnection.cpp rename to network/activeconnection.cpp diff --git a/networkmanagement/activeconnection.h b/network/activeconnection.h similarity index 100% rename from networkmanagement/activeconnection.h rename to network/activeconnection.h diff --git a/networkmanagement/appletproxymodel.cpp b/network/appletproxymodel.cpp similarity index 100% rename from networkmanagement/appletproxymodel.cpp rename to network/appletproxymodel.cpp diff --git a/networkmanagement/appletproxymodel.h b/network/appletproxymodel.h similarity index 100% rename from networkmanagement/appletproxymodel.h rename to network/appletproxymodel.h diff --git a/networkmanagement/configuration.cpp b/network/configuration.cpp similarity index 100% rename from networkmanagement/configuration.cpp rename to network/configuration.cpp diff --git a/networkmanagement/configuration.h b/network/configuration.h similarity index 100% rename from networkmanagement/configuration.h rename to network/configuration.h diff --git a/networkmanagement/enabledconnections.cpp b/network/enabledconnections.cpp similarity index 100% rename from networkmanagement/enabledconnections.cpp rename to network/enabledconnections.cpp diff --git a/networkmanagement/enabledconnections.h b/network/enabledconnections.h similarity index 100% rename from networkmanagement/enabledconnections.h rename to network/enabledconnections.h diff --git a/networkmanagement/enums.cpp b/network/enums.cpp similarity index 100% rename from networkmanagement/enums.cpp rename to network/enums.cpp diff --git a/networkmanagement/enums.h b/network/enums.h similarity index 100% rename from networkmanagement/enums.h rename to network/enums.h diff --git a/networkmanagement/handler.cpp b/network/handler.cpp similarity index 100% rename from networkmanagement/handler.cpp rename to network/handler.cpp diff --git a/networkmanagement/handler.h b/network/handler.h similarity index 100% rename from networkmanagement/handler.h rename to network/handler.h diff --git a/networkmanagement/identitymodel.cpp b/network/identitymodel.cpp similarity index 100% rename from networkmanagement/identitymodel.cpp rename to network/identitymodel.cpp diff --git a/networkmanagement/identitymodel.h b/network/identitymodel.h similarity index 100% rename from networkmanagement/identitymodel.h rename to network/identitymodel.h diff --git a/networkmanagement/networkitemslist.cpp b/network/networkitemslist.cpp similarity index 100% rename from networkmanagement/networkitemslist.cpp rename to network/networkitemslist.cpp diff --git a/networkmanagement/networkitemslist.h b/network/networkitemslist.h similarity index 100% rename from networkmanagement/networkitemslist.h rename to network/networkitemslist.h diff --git a/networkmanagement/networkmodel.cpp b/network/networkmodel.cpp similarity index 100% rename from networkmanagement/networkmodel.cpp rename to network/networkmodel.cpp diff --git a/networkmanagement/networkmodel.h b/network/networkmodel.h similarity index 100% rename from networkmanagement/networkmodel.h rename to network/networkmodel.h diff --git a/networkmanagement/networkmodelitem.cpp b/network/networkmodelitem.cpp similarity index 100% rename from networkmanagement/networkmodelitem.cpp rename to network/networkmodelitem.cpp diff --git a/networkmanagement/networkmodelitem.h b/network/networkmodelitem.h similarity index 100% rename from networkmanagement/networkmodelitem.h rename to network/networkmodelitem.h diff --git a/networkmanagement/qmlplugins.cpp b/network/qmlplugins.cpp similarity index 100% rename from networkmanagement/qmlplugins.cpp rename to network/qmlplugins.cpp diff --git a/networkmanagement/qmlplugins.h b/network/qmlplugins.h similarity index 100% rename from networkmanagement/qmlplugins.h rename to network/qmlplugins.h diff --git a/networkmanagement/uiutils.cpp b/network/uiutils.cpp similarity index 100% rename from networkmanagement/uiutils.cpp rename to network/uiutils.cpp diff --git a/networkmanagement/uiutils.h b/network/uiutils.h similarity index 100% rename from networkmanagement/uiutils.h rename to network/uiutils.h diff --git a/networkmanagement/wifisettings.cpp b/network/wifisettings.cpp similarity index 100% rename from networkmanagement/wifisettings.cpp rename to network/wifisettings.cpp diff --git a/networkmanagement/wifisettings.h b/network/wifisettings.h similarity index 100% rename from networkmanagement/wifisettings.h rename to network/wifisettings.h diff --git a/networkmanagement/wiressitemsettings.cpp b/network/wiressitemsettings.cpp similarity index 100% rename from networkmanagement/wiressitemsettings.cpp rename to network/wiressitemsettings.cpp diff --git a/networkmanagement/wiressitemsettings.h b/network/wiressitemsettings.h similarity index 100% rename from networkmanagement/wiressitemsettings.h rename to network/wiressitemsettings.h diff --git a/networkmanagement/qmldir b/networkmanagement/qmldir deleted file mode 100644 index 706fddd..0000000 --- a/networkmanagement/qmldir +++ /dev/null @@ -1,3 +0,0 @@ -module Cutefish.NetworkManagement - -plugin cutefishnm_qmlplugins \ No newline at end of file diff --git a/screen/CMakeLists.txt b/screen/CMakeLists.txt index 95146ed..79ec174 100644 --- a/screen/CMakeLists.txt +++ b/screen/CMakeLists.txt @@ -1,10 +1,3 @@ -cmake_minimum_required(VERSION 3.5) -project(cutefish-screen LANGUAGES CXX) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTOUIC ON) -set(CMAKE_AUTORCC ON) - set(SCREEN_SRCS qt5/output.cpp qt5/outputmodel.cpp @@ -15,14 +8,24 @@ set(SCREEN_SRCS find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick) find_package(KF6Screen REQUIRED) -add_library(cutefishscreen_qmlplugins SHARED ${SCREEN_SRCS}) +add_library(cutefish-framework-screen SHARED ${SCREEN_SRCS}) + +qt_add_qml_module(cutefish-framework-screen + URI Cutefish.Screen + VERSION 1.0 + PLUGIN_TARGET cutefish-framework-screen + CLASS_NAME QmlPlugins + NO_GENERATE_PLUGIN_SOURCE + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Cutefish/Screen" +) + +add_library(Cutefish::Screen ALIAS cutefish-framework-screen) -target_link_libraries (cutefishscreen_qmlplugins +target_link_libraries(cutefish-framework-screen PUBLIC Qt6::Core Qt6::Quick Qt6::Gui KF6::Screen ) -install(TARGETS cutefishscreen_qmlplugins DESTINATION ${INSTALL_QMLDIR}/Cutefish/Screen) -install(FILES qmldir DESTINATION ${INSTALL_QMLDIR}/Cutefish/Screen) +cutefish_install_qml_module(cutefish-framework-screen) diff --git a/screen/qmldir b/screen/qmldir deleted file mode 100644 index 3ba928b..0000000 --- a/screen/qmldir +++ /dev/null @@ -1,3 +0,0 @@ -module Cutefish.Screen - -plugin cutefishscreen_qmlplugins \ No newline at end of file diff --git a/system/CMakeLists.txt b/system/CMakeLists.txt deleted file mode 100644 index 0e89815..0000000 --- a/system/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -set(SCREEN_SRCS - wallpaper.cpp - wallpaper.h - plugin.cpp -) - -find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick DBus) - -add_library(cutefishsystem_qmlplugins SHARED ${SCREEN_SRCS}) - -target_link_libraries (cutefishsystem_qmlplugins - Qt6::Core - Qt6::Quick - Qt6::Gui - Qt6::DBus -) - -install(TARGETS cutefishsystem_qmlplugins DESTINATION ${INSTALL_QMLDIR}/Cutefish/System) -install(FILES qmldir DESTINATION ${INSTALL_QMLDIR}/Cutefish/System) diff --git a/system/qmldir b/system/qmldir deleted file mode 100644 index 3ec350a..0000000 --- a/system/qmldir +++ /dev/null @@ -1,3 +0,0 @@ -module Cutefish.System - -plugin cutefishsystem_qmlplugins \ No newline at end of file