diff options
26 files changed, 368 insertions, 25 deletions
diff --git a/.cmake.conf b/.cmake.conf new file mode 100644 index 0000000..9305480 --- /dev/null +++ b/.cmake.conf @@ -0,0 +1 @@ +set(QT_REPO_MODULE_VERSION "6.0.0") diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..d5bedf8 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from qtdeviceutilities.pro. + +cmake_minimum_required(VERSION 3.15.0) + +include(.cmake.conf) +project(QtDeviceUtilities # special case + VERSION "${QT_REPO_MODULE_VERSION}" + DESCRIPTION "Qt Device Utilities Libraries" # special case + HOMEPAGE_URL "https://qt.io/" + LANGUAGES CXX C +) + +find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Quick DBus) # special case +find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS) + +if(NOT LINUX) + message(NOTICE "Skipping the build as the condition \"LINUX\" is not met.") + return() +endif() +if(NOT TARGET Qt::Quick) + message(NOTICE "Skipping the build as the condition \"TARGET Qt::Quick\" is not met.") + return() +endif() +qt_build_repo() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..3b2c64c --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,10 @@ +# Generated from src.pro. + +add_subdirectory(settingsui/settingsuiplugin) +add_subdirectory(settingsui/qtbuttonimageproviderplugin) +add_subdirectory(settingsui) +add_subdirectory(imports) +add_subdirectory(doc) +if(TARGET Qt::DBus) + add_subdirectory(networksettings) +endif() diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt new file mode 100644 index 0000000..21a0ea1 --- /dev/null +++ b/src/doc/CMakeLists.txt @@ -0,0 +1,2 @@ +# Generated from doc.pro. + diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt new file mode 100644 index 0000000..9ecd47d --- /dev/null +++ b/src/imports/CMakeLists.txt @@ -0,0 +1,5 @@ +# Generated from imports.pro. + +if(TARGET networksettings) + add_subdirectory(networksettings) +endif() diff --git a/src/imports/networksettings/CMakeLists.txt b/src/imports/networksettings/CMakeLists.txt new file mode 100644 index 0000000..0c43a30 --- /dev/null +++ b/src/imports/networksettings/CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from networksettings.pro. + +##################################################################### +## networksettingsplugin Plugin: +##################################################################### + +qt_add_qml_module(networksettingsplugin + URI "QtDeviceUtilities.NetworkSettings" + VERSION "${CMAKE_PROJECT_VERSION}" + CLASSNAME NetworkSettingsQmlPlugin + SKIP_TYPE_REGISTRATION + SOURCES + plugin.cpp plugin.h + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::Qml + Qt::Quick + networksettings +) + +#### Keys ignored in scope 1:.:.:networksettings.pro:<TRUE>: +# QML_IMPORT_VERSION = "$$QT_VERSION" +# TARGETPATH = "QtDeviceUtilities/NetworkSettings" diff --git a/src/imports/networksettings/networksettings.pro b/src/imports/networksettings/networksettings.pro index 7c1dc0a..c630fb2 100644 --- a/src/imports/networksettings/networksettings.pro +++ b/src/imports/networksettings/networksettings.pro @@ -1,6 +1,6 @@ QT += qml quick networksettings - CONFIG += no_cxx_module +QML_IMPORT_VERSION = $$QT_VERSION TARGET = networksettingsplugin TARGETPATH = QtDeviceUtilities/NetworkSettings diff --git a/src/imports/networksettings/plugin.h b/src/imports/networksettings/plugin.h index 0cae114..6125127 100644 --- a/src/imports/networksettings/plugin.h +++ b/src/imports/networksettings/plugin.h @@ -39,7 +39,7 @@ class NetworkSettingsQmlPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: - void registerTypes(const char *uri); + void registerTypes(const char *uri) override; }; QT_END_NAMESPACE diff --git a/src/networksettings/CMakeLists.txt b/src/networksettings/CMakeLists.txt new file mode 100644 index 0000000..41057e5 --- /dev/null +++ b/src/networksettings/CMakeLists.txt @@ -0,0 +1,38 @@ +# Generated from networksettings.pro. + +##################################################################### +## NetworkSettings Module: +##################################################################### + +qt_add_module(NetworkSettings + SOURCES + connman/connmancommon.cpp connman/connmancommon.h + connman/qnetworksettingsinterface_p.cpp connman/qnetworksettingsinterface_p.h + connman/qnetworksettingsmanager_p.cpp connman/qnetworksettingsmanager_p.h + connman/qnetworksettingsservice_p.cpp connman/qnetworksettingsservice_p.h + connman/qnetworksettingsuseragent_p.cpp connman/qnetworksettingsuseragent_p.h + qnetworksettings.cpp qnetworksettings.h + qnetworksettingsaddressmodel.cpp qnetworksettingsaddressmodel.h + qnetworksettingsinterface.cpp qnetworksettingsinterface.h + qnetworksettingsinterfacemodel.cpp qnetworksettingsinterfacemodel.h + qnetworksettingsmanager.cpp qnetworksettingsmanager.h + qnetworksettingsservice.cpp qnetworksettingsservice.h + qnetworksettingsservicemodel.cpp qnetworksettingsservicemodel.h + qnetworksettingsuseragent.cpp qnetworksettingsuseragent.h + DBUS_INTERFACE_SOURCES + connman/connman_manager.xml + connman/connman_service.xml + connman/connman_technology.xml + DBUS_INTERFACE_FLAGS # special case + -iconnmancommon.h # special case + INCLUDE_DIRECTORIES + connman + PUBLIC_LIBRARIES + Qt::Core + Qt::DBus + Qt::Network +) + +#### Keys ignored in scope 1:.:.:networksettings.pro:<TRUE>: +# MODULE = "networksettings" +# VERSION = "1.0" diff --git a/src/networksettings/connman.pri b/src/networksettings/connman.pri index 957f2f0..3f92830 100644 --- a/src/networksettings/connman.pri +++ b/src/networksettings/connman.pri @@ -1,6 +1,7 @@ QT += core network dbus INCLUDEPATH += $${PWD}/connman +DEFINES += QMAKE_BUILD DBUS_INTERFACES = \ connman/connman_manager.xml \ diff --git a/src/networksettings/connman/connmancommon.h b/src/networksettings/connman/connmancommon.h index 3c8aa67..4b792ce 100644 --- a/src/networksettings/connman/connmancommon.h +++ b/src/networksettings/connman/connmancommon.h @@ -33,7 +33,7 @@ #include <QtDBus> #include <QtNetworkSettings/qnetworksettings.h> -#define AgentPath "/ConnmanAgent" +#define PropertyAgentPath QStringLiteral("/ConnmanAgent") #define PropertyState QStringLiteral("State") #define PropertyName QStringLiteral("Name") #define PropertyType QStringLiteral("Type") diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp index fe62bbe..7c65018 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp +++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp @@ -26,15 +26,17 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ +#include <QFile> +#include <QNetworkInterface> #include "qnetworksettingsmanager_p.h" -#include "connman_manager_interface.cpp" -#include "moc_connman_manager_interface.cpp" #include "qnetworksettingsinterface.h" #include "qnetworksettingsinterface_p.h" #include "qnetworksettingsservicemodel.h" #include "qnetworksettingsuseragent.h" -#include <QFile> -#include <QNetworkInterface> +#include "moc_connman_manager_interface.cpp" +#ifdef QMAKE_BUILD +#include "connman_manager_interface.cpp" +#endif QT_BEGIN_NAMESPACE @@ -53,6 +55,8 @@ QNetworkSettingsManagerPrivate::QNetworkSettingsManagerPrivate(QNetworkSettingsM , m_currentWiredConnection(Q_NULLPTR) , m_initialized(false) { + qRegisterMetaType<ConnmanMapStruct>("ConnmanMapStruct"); + qRegisterMetaType<ConnmanMapStructList>("ConnmanMapStructList"); qDBusRegisterMetaType<ConnmanMapStruct>(); qDBusRegisterMetaType<ConnmanMapStructList>(); @@ -99,7 +103,7 @@ bool QNetworkSettingsManagerPrivate::initialize() connect(m_manager, &NetConnmanManagerInterface::TechnologyAdded, this, &QNetworkSettingsManagerPrivate::onTechnologyAdded); connect(m_manager, &NetConnmanManagerInterface::TechnologyRemoved, this, &QNetworkSettingsManagerPrivate::onTechnologyRemoved); - m_manager->RegisterAgent(QDBusObjectPath(AgentPath)); + m_manager->RegisterAgent(QDBusObjectPath(PropertyAgentPath)); m_initialized = true; } else { delete m_manager; diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.cpp b/src/networksettings/connman/qnetworksettingsuseragent_p.cpp index 5052b74..2c1e399 100644 --- a/src/networksettings/connman/qnetworksettingsuseragent_p.cpp +++ b/src/networksettings/connman/qnetworksettingsuseragent_p.cpp @@ -76,7 +76,7 @@ void QNetworkSettingsUserAgentPrivate::ReportError(const QDBusObjectPath &path, void QNetworkSettingsUserAgentPrivate::registerAgent() { Q_Q(QNetworkSettingsUserAgent); - QDBusConnection::systemBus().registerObject(QStringLiteral(AgentPath), q); + QDBusConnection::systemBus().registerObject(PropertyAgentPath, q); } QVariantMap QNetworkSettingsUserAgentPrivate::RequestInput(const QDBusObjectPath &path, const QVariantMap ¶ms, const QDBusMessage &msg) diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.h b/src/networksettings/connman/qnetworksettingsuseragent_p.h index 31170d3..b85ddd2 100644 --- a/src/networksettings/connman/qnetworksettingsuseragent_p.h +++ b/src/networksettings/connman/qnetworksettingsuseragent_p.h @@ -49,7 +49,6 @@ class QByteArray; template<class T> class QList; template<class Key, class Value> class QMap; class QString; -class QStringList; class QVariant; const QString AgentPath(QStringLiteral("/ConnmanAgent")); diff --git a/src/networksettings/qnetworksettingsinterfacemodel.h b/src/networksettings/qnetworksettingsinterfacemodel.h index 6dd1f2a..42d40b6 100644 --- a/src/networksettings/qnetworksettingsinterfacemodel.h +++ b/src/networksettings/qnetworksettingsinterfacemodel.h @@ -43,9 +43,9 @@ class Q_DECL_EXPORT QNetworkSettingsInterfaceModel : public QAbstractListModel public: explicit QNetworkSettingsInterfaceModel(QObject *parent = Q_NULLPTR); // from QAbstractItemModel - int rowCount(const QModelIndex & parent = QModelIndex()) const; - QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const; - QHash<int, QByteArray> roleNames() const; + int rowCount(const QModelIndex & parent = QModelIndex()) const override; + QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override; + QHash<int, QByteArray> roleNames() const override; void append(QNetworkSettingsInterface* networkInterface); void insert(int row, QNetworkSettingsInterface* networkInterface); diff --git a/src/networksettings/qnetworksettingsmanager.h b/src/networksettings/qnetworksettingsmanager.h index 4d20179..8526324 100644 --- a/src/networksettings/qnetworksettingsmanager.h +++ b/src/networksettings/qnetworksettingsmanager.h @@ -32,14 +32,13 @@ #include <QtNetworkSettings/qnetworksettings.h> #include <QObject> #include <QStringListModel> +#include "qnetworksettingsservicemodel.h" +#include "qnetworksettingsinterfacemodel.h" +#include "qnetworksettingsuseragent.h" +#include "qnetworksettingsservice.h" QT_FORWARD_DECLARE_CLASS(QNetworkSettingsManagerPrivate) -QT_FORWARD_DECLARE_CLASS(QNetworkSettingsService) -QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceModel) -QT_FORWARD_DECLARE_CLASS(QNetworkSettingsUserAgent) -QT_FORWARD_DECLARE_CLASS(QNetworkSettingsServiceFilter) QT_FORWARD_DECLARE_CLASS(QNetworkSettingsInterface) -QT_FORWARD_DECLARE_CLASS(QNetworkSettingsInterfaceModel) QT_BEGIN_NAMESPACE diff --git a/src/networksettings/qnetworksettingsservicemodel.h b/src/networksettings/qnetworksettingsservicemodel.h index 8c34e89..01447f6 100644 --- a/src/networksettings/qnetworksettingsservicemodel.h +++ b/src/networksettings/qnetworksettingsservicemodel.h @@ -42,9 +42,9 @@ public: explicit QNetworkSettingsServiceModel(QObject *parent = Q_NULLPTR); virtual ~QNetworkSettingsServiceModel(); // from QAbstractItemModel - int rowCount(const QModelIndex & parent = QModelIndex()) const; - QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const; - QHash<int, QByteArray> roleNames() const; + int rowCount(const QModelIndex & parent = QModelIndex()) const override; + QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override; + QHash<int, QByteArray> roleNames() const override; bool replacePlaceholder(QNetworkSettingsService* networkService); void append(QNetworkSettingsService* networkService); diff --git a/src/settingsui/CMakeLists.txt b/src/settingsui/CMakeLists.txt new file mode 100644 index 0000000..e7801db --- /dev/null +++ b/src/settingsui/CMakeLists.txt @@ -0,0 +1,88 @@ +# Generated from settingsui.pro. + +##################################################################### +## settingsui Binary: +##################################################################### + +qt_add_executable(settingsui + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Qml + Qt::Quick +) + +# Resources: +set(settingsuiapp_resource_files + "AutoScroller.qml" + "ViewSettings.qml" + "common/CustomSwitch.qml" + "common/HandwritingModeButton.qml" + "main.qml" + "network/AddressListEntry.qml" + "network/ComboBoxEntry.qml" + "network/EditWiredSettings.qml" + "network/IpAddressTextField.qml" + "network/NetworkDetails.qml" + "network/NetworkListView.qml" + "network/NetworkSettings.qml" + "network/PassphraseEnter.qml" + "network/WifiSelectorDelegate.qml" + "network/WifiSettings.qml" + "network/WifiSignalMonitor.qml" + "network/WiredSettings.qml" + "settingsuiplugin/SettingsDelegate.qml" + "settingsuiplugin/SettingsHeader.qml" + "settingsuiplugin/SettingsTitleItem.qml" + "settingsuiplugin/pluginMain.qml" +) + +qt_add_resource(settingsui "settingsuiapp" + PREFIX + "/" + FILES + ${settingsuiapp_resource_files} +) + + +#### Keys ignored in scope 1:.:.:settingsui.pro:<TRUE>: +# QML_IMPORT_PATH = <EMPTY> +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +qt_extend_target(settingsui CONDITION static + PUBLIC_LIBRARIES + Qt::Svg +) + +#### Keys ignored in scope 2:.:.:settingsui.pro:static: +# QTPLUGIN = "qtvirtualkeyboardplugin" + +#### Keys ignored in scope 4:.:.:deployment.pri:android-no-sdk: +# INSTALLS = "target" +# target.path = "/data/user/qt" + +#### Keys ignored in scope 6:.:.:deployment.pri:ANDROID: +# INSTALLS = "target" + +#### Keys ignored in scope 7:.:.:deployment.pri:TEST_architecture_arch STREQUAL i386: +# target.path = "/libs/x86" + +#### Keys ignored in scope 9:.:.:deployment.pri:TEST_architecture_arch STREQUAL arm: +# target.path = "/libs/armeabi-v7a" + +#### Keys ignored in scope 10:.:.:deployment.pri:else: +# target.path = "/libs/armeabi" + +#### Keys ignored in scope 12:.:.:deployment.pri:UNIX: +# INSTALLS = "target" + +#### Keys ignored in scope 14:.:.:deployment.pri:QNX: +# target.path = "/tmp/$${TARGET}/bin" + +#### Keys ignored in scope 15:.:.:deployment.pri:else: +# target.path = "$$[QT_INSTALL_BINS]" diff --git a/src/settingsui/main.cpp b/src/settingsui/main.cpp index 40e4428..8ebe695 100644 --- a/src/settingsui/main.cpp +++ b/src/settingsui/main.cpp @@ -32,7 +32,6 @@ int main(int argc, char *argv[]) { qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard")); - QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); diff --git a/src/settingsui/qtbuttonimageproviderplugin/CMakeLists.txt b/src/settingsui/qtbuttonimageproviderplugin/CMakeLists.txt new file mode 100644 index 0000000..abe52e9 --- /dev/null +++ b/src/settingsui/qtbuttonimageproviderplugin/CMakeLists.txt @@ -0,0 +1,37 @@ +# Generated from qtbuttonimageproviderplugin.pro. + +##################################################################### +## qtbuttonimageproviderplugin Plugin: +##################################################################### + +qt_add_qml_module(qtbuttonimageproviderplugin + URI "QtDeviceUtilities.QtButtonImageProvider" + VERSION "${CMAKE_PROJECT_VERSION}" + CLASSNAME QtButtonImageProviderQmlPlugin + SKIP_TYPE_REGISTRATION + SOURCES + plugin.cpp + qtbuttonimageprovider.cpp qtbuttonimageprovider.h + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::Qml + Qt::Quick +) + +# Resources: +set(qtbuttonimageprovider_resource_files + "QtButton.qml" +) + +qt_add_resource(qtbuttonimageproviderplugin "qtbuttonimageprovider" + PREFIX + "/" + FILES + ${qtbuttonimageprovider_resource_files} +) + + +#### Keys ignored in scope 1:.:.:qtbuttonimageproviderplugin.pro:<TRUE>: +# QML_IMPORT_VERSION = "$$QT_VERSION" +# TARGETPATH = "QtDeviceUtilities/QtButtonImageProvider" diff --git a/src/settingsui/qtbuttonimageproviderplugin/plugin.cpp b/src/settingsui/qtbuttonimageproviderplugin/plugin.cpp index 7245feb..c017a05 100644 --- a/src/settingsui/qtbuttonimageproviderplugin/plugin.cpp +++ b/src/settingsui/qtbuttonimageproviderplugin/plugin.cpp @@ -49,14 +49,14 @@ class QtButtonImageProviderQmlPlugin : public QQmlExtensionPlugin public: QtButtonImageProviderQmlPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); } - void registerTypes(const char *uri) + void registerTypes(const char *uri) override { Q_UNUSED(uri) Q_ASSERT(uri == QLatin1String("QtDeviceUtilities.QtButtonImageProvider")); qmlRegisterType(QUrl("qrc:/QtButton.qml"), uri, 1, 0, "QtButton"); } - void initializeEngine(QQmlEngine *engine, const char *uri) + void initializeEngine(QQmlEngine *engine, const char *uri) override { Q_UNUSED(uri); QtButtonImageProvider *provider = new QtButtonImageProvider(); diff --git a/src/settingsui/qtbuttonimageproviderplugin/qtbuttonimageprovider.h b/src/settingsui/qtbuttonimageproviderplugin/qtbuttonimageprovider.h index 8fe7cdc..94f410e 100644 --- a/src/settingsui/qtbuttonimageproviderplugin/qtbuttonimageprovider.h +++ b/src/settingsui/qtbuttonimageproviderplugin/qtbuttonimageprovider.h @@ -37,7 +37,7 @@ class QtButtonImageProvider : public QQuickImageProvider public: QtButtonImageProvider(); - QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize); + QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) override; void setCutSize(int size) { m_cutSize = size; } private: diff --git a/src/settingsui/qtbuttonimageproviderplugin/qtbuttonimageproviderplugin.pro b/src/settingsui/qtbuttonimageproviderplugin/qtbuttonimageproviderplugin.pro index 2cba61b..ba26174 100644 --- a/src/settingsui/qtbuttonimageproviderplugin/qtbuttonimageproviderplugin.pro +++ b/src/settingsui/qtbuttonimageproviderplugin/qtbuttonimageproviderplugin.pro @@ -1,5 +1,6 @@ QT += qml quick CONFIG += no_cxx_module +QML_IMPORT_VERSION = $$QT_VERSION TARGET = qtbuttonimageproviderplugin TARGETPATH = QtDeviceUtilities/QtButtonImageProvider diff --git a/src/settingsui/settingsuiplugin/CMakeLists.txt b/src/settingsui/settingsuiplugin/CMakeLists.txt new file mode 100644 index 0000000..da3142f --- /dev/null +++ b/src/settingsui/settingsuiplugin/CMakeLists.txt @@ -0,0 +1,103 @@ +# Generated from settingsuiplugin.pro. + +##################################################################### +## settingsuiplugin Plugin: +##################################################################### + +qt_add_qml_module(settingsuiplugin + URI "QtDeviceUtilities.SettingsUI" + VERSION "${CMAKE_PROJECT_VERSION}" + CLASSNAME SettingsUIQmlPlugin + SKIP_TYPE_REGISTRATION + SOURCES + plugin.cpp + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::Qml + Qt::Quick +) + +# Resources: +set(settingsui_resource_files + "../common/CustomSwitch.qml" + "../common/CustomTableView.qml" + "../common/HandwritingModeButton.qml" + "../network/AddressListEntry.qml" + "../network/ComboBoxEntry.qml" + "../network/EditWiredSettings.qml" + "../network/IpAddressTextField.qml" + "../network/NetworkDetails.qml" + "../network/NetworkListView.qml" + "../network/NetworkSettings.qml" + "../network/PassphraseEnter.qml" + "../network/WifiSelectorDelegate.qml" + "../network/WifiSettings.qml" + "../network/WifiSignalMonitor.qml" + "../network/WiredSettings.qml" + "SettingsDelegate.qml" + "SettingsHeader.qml" + "SettingsTitleItem.qml" + "icons/Alert_yellow_1x.png" + "icons/Audio_qt_6x.png" + "icons/Bluetooth_qt_1x.png" + "icons/Bluetooth_qt_6x.png" + "icons/Camcorder_qt_1x.png" + "icons/Camera_qt_1x.png" + "icons/Chevron-left_black.png" + "icons/Chevron-left_black_6x.png" + "icons/Clock_qt_1x.png" + "icons/Clock_qt_6x.png" + "icons/Display_qt_6x.png" + "icons/Flag_qt_6x.png" + "icons/FloatingButton_Active.png" + "icons/FloatingButton_Available.png" + "icons/FloatingButton_Unavailable.png" + "icons/Headphones_qt_1x.png" + "icons/Heartbeat_qt_1x.png" + "icons/Keyboard_qt_1x.png" + "icons/Laptop_qt_1x.png" + "icons/Microphone_qt_1x.png" + "icons/MobilePhone_qt_1x.png" + "icons/Mouse_qt_1x.png" + "icons/Power_black_6x.png" + "icons/Tablet_qt_1x.png" + "icons/Volume_down_qt_1x.png" + "icons/Volume_mute_qt_1x.png" + "icons/Volume_up_qt_1x.png" + "icons/WifiAnim_black_2x.png" + "icons/Wifi_lightgray_2x.png" + "icons/World_qt_6x.png" + "newIcons/back_icon.svg" + "newIcons/close_icon.svg" + "newIcons/detail_icon.svg" + "newIcons/grid_icon.svg" + "newIcons/header_toggle_icon.svg" + "newIcons/info_icon.svg" + "newIcons/mouse_icon.svg" + "newIcons/mute_icon.svg" + "newIcons/network_icon.svg" + "newIcons/pause_icon.svg" + "newIcons/play_icon.svg" + "newIcons/qt_logo_green_rgb.svg" + "newIcons/settings_icon.svg" + "newIcons/settingsmenu_launcher_icon.svg" + "newIcons/stop_icon.svg" + "newIcons/touch_icon.svg" + "newIcons/volume_icon.svg" + "pluginMain.qml" + "settingsview.xml" +) + +qt_add_resource(settingsuiplugin "settingsui" + PREFIX + "/" + FILES + ${settingsui_resource_files} +) + + +#### Keys ignored in scope 1:.:.:settingsuiplugin.pro:<TRUE>: +# DISTFILES = "qmldir" +# QML_IMPORT_VERSION = "$$QT_VERSION" +# TARGETPATH = "QtDeviceUtilities/SettingsUI" diff --git a/src/settingsui/settingsuiplugin/settingsuiplugin.pro b/src/settingsui/settingsuiplugin/settingsuiplugin.pro index 6b8a3af..a2e1d59 100644 --- a/src/settingsui/settingsuiplugin/settingsuiplugin.pro +++ b/src/settingsui/settingsuiplugin/settingsuiplugin.pro @@ -1,5 +1,6 @@ QT += qml quick CONFIG += no_cxx_module +QML_IMPORT_VERSION = $$QT_VERSION TARGET = settingsuiplugin TARGETPATH = QtDeviceUtilities/SettingsUI diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 0000000..2214137 --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1,7 @@ +# Generated from tests.pro. + +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. +endif() +qt_build_tests() |