Build device utilities with CMake and qmake against Qt 6

Also fix compiler warnings.

Task-number: QTBUG-88317
Change-Id: Iff6014613a7d12426b6fe692dff0000c92930ace
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

8 files changed, 233 insertions, 4 deletions

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