Port to Qt 6.2

 - Build is warning free on Linux
 - Still using qmake
 - Custom fragmenShaders in the cluster are not ported yet
 - Qt 3D models are rendered, but the Studio 3D integration is untested

Change-Id: I0e410a932d6461ba29e7c945cb5e9750d6df8964
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Reviewed-by: Bramastyo Harimukti Santoso <bram.harimukti@gmail.com>

18 files changed, 44 insertions, 61 deletions

diff --git a/sysui/about/About.qml b/sysui/about/About.qml
index b47f7274..1258e852 100644
--- a/sysui/about/About.qml
+++ b/sysui/about/About.qml
@@ -41,7 +41,7 @@ import system.controls 1.0
 PopupItemLoader {
     id: root
 
-    source: "AboutPopup.qml"
+    source: Qt.resolvedUrl("./AboutPopup.qml")
 
     // to be set/called from outside
     property var applicationModel
diff --git a/sysui/about/AboutApps.qml b/sysui/about/AboutApps.qml
index efaa7d61..56adfee5 100644
--- a/sysui/about/AboutApps.qml
+++ b/sysui/about/AboutApps.qml
@@ -174,7 +174,7 @@ Item {
         Item {
             id: delegateRoot
 
-            width: parent.width
+            width: ListView.view.width
             implicitHeight: Sizes.dp(265)
 
             function getWindowTypeName(window) {
diff --git a/sysui/centerconsole/+lucee/CenterConsole.qml b/sysui/centerconsole/+lucee/CenterConsole.qml
index 7c943bc6..3735cd99 100644
--- a/sysui/centerconsole/+lucee/CenterConsole.qml
+++ b/sysui/centerconsole/+lucee/CenterConsole.qml
@@ -31,9 +31,7 @@
 ****************************************************************************/
 
 import QtQuick 2.7
-import QtGraphicalEffects 1.0
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
 
 import shared.controls 1.0
 import shared.utils 1.0
diff --git a/sysui/centerconsole/AbstractCenterConsole.qml b/sysui/centerconsole/AbstractCenterConsole.qml
index 203c5532..d4c6cb7a 100644
--- a/sysui/centerconsole/AbstractCenterConsole.qml
+++ b/sysui/centerconsole/AbstractCenterConsole.qml
@@ -32,9 +32,7 @@
 
 import QtQuick 2.7
 import QtQml 2.14
-import QtGraphicalEffects 1.0
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
 
 import shared.controls 1.0
 import shared.utils 1.0
diff --git a/sysui/centerconsole/CenterConsole.qml b/sysui/centerconsole/CenterConsole.qml
index 26cdb915..13c6c277 100644
--- a/sysui/centerconsole/CenterConsole.qml
+++ b/sysui/centerconsole/CenterConsole.qml
@@ -32,9 +32,7 @@
 
 import QtQuick 2.7
 import QtQml 2.14
-import QtGraphicalEffects 1.0
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
 
 import shared.controls 1.0
 import shared.utils 1.0
diff --git a/sysui/centerconsole/CenterConsoleWindow.qml b/sysui/centerconsole/CenterConsoleWindow.qml
index b2d42505..15f76cd5 100644
--- a/sysui/centerconsole/CenterConsoleWindow.qml
+++ b/sysui/centerconsole/CenterConsoleWindow.qml
@@ -128,17 +128,6 @@ Window {
         id: mainCenterConsole
         anchors.fill: parent
 
-        Loader {
-            sourceComponent: Component {
-                GamePadController {
-                    onButtonBPressed: root.nextICAppIsRequested();
-                    onButtonR1Pressed: root.store.musicStore.sendIntent("next");
-                    onButtonL1Pressed: root.store.musicStore.sendIntent("prev");
-                }
-            }
-            active: root.store.enableCursorManagement
-        }
-
         CenterConsole {
             id: centerConsole
             anchors.centerIn: parent
diff --git a/sysui/centerconsole/MainContentArea.qml b/sysui/centerconsole/MainContentArea.qml
index b664243c..f4f152cc 100644
--- a/sysui/centerconsole/MainContentArea.qml
+++ b/sysui/centerconsole/MainContentArea.qml
@@ -31,7 +31,7 @@
 ****************************************************************************/
 
 import QtQuick 2.10
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import shared.animations 1.0
 import home 1.0
 import launcher 1.0
diff --git a/sysui/centerconsole/ModalOverlay.qml b/sysui/centerconsole/ModalOverlay.qml
index 7180d003..f0c04c02 100644
--- a/sysui/centerconsole/ModalOverlay.qml
+++ b/sysui/centerconsole/ModalOverlay.qml
@@ -31,7 +31,7 @@
 ****************************************************************************/
 
 import QtQuick 2.10
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 
 import shared.animations 1.0
 import shared.utils 1.0
diff --git a/sysui/helper/utils.js b/sysui/helper/utils.js
index 3d57dc28..603932bb 100644
--- a/sysui/helper/utils.js
+++ b/sysui/helper/utils.js
@@ -31,34 +31,35 @@
 ****************************************************************************/
 
 .pragma library
+.import QtQml as Qml
 
 function orientationFromString(str) {
     str = str.trim().toLowerCase().replace('-','').replace('_','').replace('orientation','')
 
     if (str === "portrait") {
-        return Qt.PortraitOrientation;
-    } else if (str === "invertedportrait") {
-        return Qt.InvertedPortraitOrientation;
-    } else if (str === "landscape") {
-        return Qt.LandscapeOrientation;
+        return Qml.Qt.PortraitOrientation;
+   } else if (str === "invertedportrait") {
+       return Qml.Qt.InvertedPortraitOrientation;
+   } else if (str === "landscape") {
+        return Qml.Qt.LandscapeOrientation;
     } else if (str === "invertedlandscape") {
-        return Qt.InvertedLandscapeOrientation;
+        return Qml.Qt.InvertedLandscapeOrientation;
     } else {
         // default to portrait
-        return Qt.PortraitOrientation;
+        return Qml.Qt.PortraitOrientation;
     }
 }
 
 function invertOrientation(orientation) {
     switch (orientation) {
-        case Qt.PortraitOrientation:
-            return Qt.InvertedPortraitOrientation;
-        case Qt.InvertedPortraitOrientation:
-            return Qt.PortraitOrientation;
-        case Qt.LandscapeOrientation:
-            return Qt.InvertedLandscapeOrientation;
-        case Qt.InvertedLandscapeOrientation:
-            return Qt.LandscapeOrientation;
+        case Qml.Qt.PortraitOrientation:
+            return Qml.Qt.InvertedPortraitOrientation;
+        case Qml.Qt.InvertedPortraitOrientation:
+            return Qml.Qt.PortraitOrientation;
+        case Qml.Qt.LandscapeOrientation:
+            return Qml.Qt.InvertedLandscapeOrientation;
+        case Qml.Qt.InvertedLandscapeOrientation:
+            return Qml.Qt.LandscapeOrientation;
         default:
             return orientation;
     }
@@ -67,26 +68,26 @@ function invertOrientation(orientation) {
 function rotateDisplay(orientation, isLandscape) {
     if (isLandscape) {
         switch (orientation) {
-            case Qt.PortraitOrientation:
+            case Qml.Qt.PortraitOrientation:
                 return 90;
-            case Qt.LandscapeOrientation:
+            case Qml.Qt.LandscapeOrientation:
                 return 0;
-            case Qt.InvertedPortraitOrientation:
+            case Qml.Qt.InvertedPortraitOrientation:
                 return -90;
-            case Qt.InvertedLandscapeOrientation:
+            case Qml.Qt.InvertedLandscapeOrientation:
                 return 180;
             default:
                 return 0;
         }
     } else {
         switch (orientation) {
-            case Qt.PortraitOrientation:
+            case Qml.Qt.PortraitOrientation:
                 return 0;
-            case Qt.LandscapeOrientation:
+            case Qml.Qt.LandscapeOrientation:
                 return -90;
-            case Qt.InvertedPortraitOrientation:
+            case Qml.Qt.InvertedPortraitOrientation:
                 return 180;
-            case Qt.InvertedLandscapeOrientation:
+            case Qml.Qt.InvertedLandscapeOrientation:
                 return 90;
             default:
                 return 0;
diff --git a/sysui/home/+lucee/ApplicationWidget.qml b/sysui/home/+lucee/ApplicationWidget.qml
index 3705168e..49f1c6a0 100644
--- a/sysui/home/+lucee/ApplicationWidget.qml
+++ b/sysui/home/+lucee/ApplicationWidget.qml
@@ -32,7 +32,7 @@
 
 import QtQuick 2.7
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import shared.animations 1.0
 import shared.utils 1.0
 import shared.controls 1.0
diff --git a/sysui/home/AbstractApplicationWidget.qml b/sysui/home/AbstractApplicationWidget.qml
index bc6ddee3..b2341c58 100644
--- a/sysui/home/AbstractApplicationWidget.qml
+++ b/sysui/home/AbstractApplicationWidget.qml
@@ -32,7 +32,7 @@
 
 import QtQuick 2.7
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import shared.animations 1.0
 import shared.utils 1.0
 import shared.controls 1.0
diff --git a/sysui/home/ApplicationWidget.qml b/sysui/home/ApplicationWidget.qml
index 7d70ce7f..b24bd7c4 100644
--- a/sysui/home/ApplicationWidget.qml
+++ b/sysui/home/ApplicationWidget.qml
@@ -32,7 +32,7 @@
 
 import QtQuick 2.7
 import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import shared.animations 1.0
 import shared.utils 1.0
 import shared.controls 1.0
diff --git a/sysui/home/WidgetGrid.qml b/sysui/home/WidgetGrid.qml
index 00757f01..123cd226 100644
--- a/sysui/home/WidgetGrid.qml
+++ b/sysui/home/WidgetGrid.qml
@@ -448,11 +448,11 @@ Item {
                         property real dragStartTouchPosY
                         property real dragTouchPosY
 
-                        onDraggedOntoPos: {
+                        onDraggedOntoPos: function(pos) {
                             dragTouchPosY = appWidget.mapToItem(root, pos.x, pos.y).y;
                             widgetColumn.onWidgetMoved(repeaterDelegate);
                         }
-                        onDragStarted: {
+                        onDragStarted: function(pos) {
                             dragStartPosY = appWidget.mapToItem(root, 0, 0).y
                             dragTouchPosY = dragStartTouchPosY = appWidget.mapToItem(root, pos.x, pos.y).y
                             beingDragged = true;
diff --git a/sysui/procmon/MonitorView.qml b/sysui/procmon/MonitorView.qml
index 29e0de28..fd2f1839 100644
--- a/sysui/procmon/MonitorView.qml
+++ b/sysui/procmon/MonitorView.qml
@@ -127,7 +127,7 @@ ColumnLayout {
                 title: qsTr("Version")
                 subtitle: qsTr("Neptune 3: %1 %2").arg(Qt.application.version).arg(neptuneInfo) + "\n" +
                           qsTr("Qt Application Manager: %1").arg(qtamVersion) + "\n" +
-                          qsTr("Qt IVI: %1").arg(qtiviVersion)
+                          qsTr("Qt IF: %1").arg(qtifVersion)
             }
 
             MonitorListItem {
diff --git a/sysui/statusbar/StatusBar.qml b/sysui/statusbar/StatusBar.qml
index 6c03c302..74c78d85 100644
--- a/sysui/statusbar/StatusBar.qml
+++ b/sysui/statusbar/StatusBar.qml
@@ -78,7 +78,7 @@ Item {
 
             MouseArea {
                 anchors.fill: parent
-                onPressAndHold: {
+                onPressAndHold: function(mouse) {
                     root.screenshotRequested();
                     mouse.accepted = true;
                 }
diff --git a/sysui/stores/CenterConsoleStore.qml b/sysui/stores/CenterConsoleStore.qml
index eecc6732..8e741200 100644
--- a/sysui/stores/CenterConsoleStore.qml
+++ b/sysui/stores/CenterConsoleStore.qml
@@ -30,7 +30,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
+import QtQuick
 import QtApplicationManager.SystemUI 2.0
 import shared.utils 1.0
 
diff --git a/sysui/stores/RootStore.qml b/sysui/stores/RootStore.qml
index 0e574fb8..a3ca2965 100644
--- a/sysui/stores/RootStore.qml
+++ b/sysui/stores/RootStore.qml
@@ -47,7 +47,6 @@ Store {
     id: root
 
     readonly property SystemStore systemStore: SystemStore {}
-    readonly property var musicAppRequestsIPC: MusicAppRequestsIPCStore  {}
     readonly property SettingsStore settingsStore: SettingsStore {}
     readonly property ClusterStore clusterStore: ClusterStore { id: clusterStore }
     readonly property HUDStore hudStore: HUDStore {}
@@ -98,7 +97,7 @@ Store {
         }
         onAutostartAppsListChanged: { settingsStore.setValue("autostartApps", applicationModel.serializeAutostart()); }
         onAutorecoverAppsListChanged: { settingsStore.setValue("autorecoverApps", applicationModel.serializeAutorecover()); }
-        onApplicationPopupAdded: applicationPopupsStore.appPopupsModel.append({"window":window});
+        onApplicationPopupAdded: function(window) { applicationPopupsStore.appPopupsModel.append({"window":window}) }
         onWidgetStatesChanged: {
             settingsStore.setValue("widgetStates", applicationModel.serializeWidgetStates());
         }
@@ -122,7 +121,7 @@ Store {
     property string lighThemeLastAccColor: "#d35756"
     property string darkThemeLastAccColor: "#b75034"
     readonly property UISettings uiSettings: UISettings {
-        onLanguageChanged: {
+        onLanguageChanged: function(language) {
             if (language !== Config.languageLocale) {
                 Config.languageLocale = language;
                 uiSettings.setRtlMode(Qt.locale(language).textDirection === Qt.RightToLeft)
@@ -137,7 +136,7 @@ Store {
             }
         }
 
-        onAccentColorChanged: {
+        onAccentColorChanged: function(accentColor) {
             if (isInitialized) {
                 if (Config._initAccentColors(uiSettings.theme)
                         .some(data => data.color === uiSettings.accentColor)) {
@@ -156,7 +155,7 @@ Store {
                 }
             });
         }
-        onIsInitializedChanged: {
+        onIsInitializedChanged: function(isInitialized) {
             if (isInitialized) {
                 theme = root.initialTheme;
 
@@ -175,11 +174,11 @@ Store {
             }
         }
 
-        onVolumeChanged: {
+        onVolumeChanged: function(volume) {
             volumeStore.player.volume = volume * 100;
         }
 
-        onMutedChanged: {
+        onMutedChanged: function(muted) {
             volumeStore.player.muted = muted;
         }
     }
@@ -253,7 +252,7 @@ Store {
         request.open("PUT", fileUrl);
         request.send("Neptune 3: %1 %2".arg(Qt.application.version).arg(neptuneInfo) + "\n" +
                      "Qt Application Manager: %1".arg(qtamVersion) + "\n" +
-                     "Qt IVI: %1".arg(qtiviVersion) + "\n\n" +
+                     "Qt IF: %1".arg(qtifVersion) + "\n\n" +
                      text);
     }
 
diff --git a/sysui/stores/VolumeStore.qml b/sysui/stores/VolumeStore.qml
index 0ea33884..4f2dea80 100644
--- a/sysui/stores/VolumeStore.qml
+++ b/sysui/stores/VolumeStore.qml
@@ -31,7 +31,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtIvi.Media 1.0
+import QtInterfaceFramework.Media 1.0
 
 QtObject {
     id: root