aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@qt.io>2022-05-13 22:42:08 +0200
committerRobert Griebl <robert.griebl@qt.io>2022-07-01 12:41:23 +0000
commit4c845c092c550d118d7ca3a4ca863aa94ec78882 (patch)
tree1aa7f8f1ac8a0a487b7082bfea1b0c26d53f4609 /apps
parentdf878f3935fe28dd3d7253b9fa59d65db331eed0 (diff)
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>
Diffstat (limited to 'apps')
-rw-r--r--apps/com.luxoft.vehicle/panels/DoorsPanel.qml2
-rw-r--r--apps/com.luxoft.vehicle/panels/FrontDoorsPanel.qml2
-rw-r--r--apps/com.luxoft.vehicle/panels/RoofPanel.qml2
-rw-r--r--apps/com.luxoft.vehicle/panels/TrunkPanel.qml2
-rw-r--r--apps/com.luxoft.vehicle/panels/Vehicle2DPanel.qml3
-rw-r--r--apps/com.luxoft.vehicle/panels/Vehicle3DControlPanel.qml5
-rw-r--r--apps/com.luxoft.vehicle/panels/Vehicle3DPanel.qml2
-rw-r--r--apps/com.luxoft.vehicle/panels/VehicleProxyPanel.qml1
-rw-r--r--apps/com.luxoft.vehicle/views/VehicleView.qml8
-rw-r--r--apps/com.pelagicore.apps.settings/controls/ColorSelector.qml7
-rw-r--r--apps/com.pelagicore.apps.settings/panels/ColorsPanel.qml2
-rw-r--r--apps/com.pelagicore.apps.settings/store/RootStore.qml2
-rw-r--r--apps/com.pelagicore.apps.settings/views/SettingsView.qml2
-rw-r--r--apps/com.pelagicore.calendar/panels/+lucee/CalendarWidgetPanel.qml3
-rw-r--r--apps/com.pelagicore.calendar/panels/CalendarGridPanel.qml3
-rw-r--r--apps/com.pelagicore.calendar/panels/CalendarMaximizedPanel.qml3
-rw-r--r--apps/com.pelagicore.calendar/panels/NextCalendarPanel.qml3
-rw-r--r--apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml3
-rw-r--r--apps/com.pelagicore.calendar/views/+lucee/CalendarView.qml3
-rw-r--r--apps/com.pelagicore.calendar/views/CalendarView.qml3
-rw-r--r--apps/com.pelagicore.climate/Main.qml2
-rw-r--r--apps/com.pelagicore.climate/panels/ClimateAirFlowPanel.qml2
-rw-r--r--apps/com.pelagicore.climate/stores/ClimateStore.qml6
-rw-r--r--apps/com.pelagicore.downloads/stores/DownloadsStates.qml2
-rw-r--r--apps/com.pelagicore.hud/panels/NaviPanel.qml30
-rw-r--r--apps/com.pelagicore.map/views/MapView.qml2
-rw-r--r--apps/com.pelagicore.music/controls/+lucee/MusicControls.qml22
-rw-r--r--apps/com.pelagicore.music/controls/MusicControls.qml22
-rw-r--r--apps/com.pelagicore.music/panels/AlbumArtDetailPanel.qml29
-rw-r--r--apps/com.pelagicore.music/panels/MusicPlayQueuePanel.qml1
-rw-r--r--apps/com.pelagicore.music/stores/MusicStore.qml12
-rw-r--r--apps/com.pelagicore.music/views/+lucee/WidgetContentView.qml2
-rw-r--r--apps/com.pelagicore.music/views/WidgetContentView.qml4
-rw-r--r--apps/com.pelagicore.phone/Main.qml1
-rw-r--r--apps/com.pelagicore.phone/controls/BlurredImageBackground.qml2
-rw-r--r--apps/com.pelagicore.phone/controls/RoundImage.qml2
-rw-r--r--apps/com.pelagicore.phone/controls/WidgetContact.qml22
-rw-r--r--apps/com.pelagicore.phone/stores/PhoneStore.qml2
-rw-r--r--apps/com.pelagicore.phone/views/FavoritesWidgetView.qml2
-rw-r--r--apps/com.pelagicore.phone/views/PhoneView.qml2
-rw-r--r--apps/com.pelagicore.tuner/controls/MusicControls.qml22
-rw-r--r--apps/com.pelagicore.tuner/controls/StationInfoColumn.qml1
-rw-r--r--apps/com.pelagicore.tuner/controls/TunerSlider.qml2
-rw-r--r--apps/com.pelagicore.tuner/stores/TunerStore.qml4
-rw-r--r--apps/com.pelagicore.tuner/views/FullScreenBottomView.qml2
-rw-r--r--apps/com.theqtcompany.cluster/Main.qml2
-rw-r--r--apps/com.theqtcompany.cluster/panels/+lucee/DialPowerPanel.qml1
-rw-r--r--apps/com.theqtcompany.cluster/panels/+lucee/DialSpeedPanel.qml3
-rw-r--r--apps/com.theqtcompany.cluster/panels/+lucee/GaugesPanel.qml1
-rw-r--r--apps/com.theqtcompany.cluster/panels/+lucee/LuceeCircles.qml2
-rw-r--r--apps/com.theqtcompany.cluster/panels/DialFramePanel.qml2
-rw-r--r--apps/com.theqtcompany.cluster/panels/DialPowerPanel.qml1
-rw-r--r--apps/com.theqtcompany.cluster/panels/DialSpeedPanel.qml2
-rw-r--r--apps/com.theqtcompany.cluster/panels/DonutGauge.qml1
-rw-r--r--apps/com.theqtcompany.cluster/panels/DrivingModeRange.qml1
-rw-r--r--apps/com.theqtcompany.cluster/panels/GaugesPanel3D.qml1
56 files changed, 139 insertions, 139 deletions
diff --git a/apps/com.luxoft.vehicle/panels/DoorsPanel.qml b/apps/com.luxoft.vehicle/panels/DoorsPanel.qml
index 8b870dd1..4aee6fd2 100644
--- a/apps/com.luxoft.vehicle/panels/DoorsPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/DoorsPanel.qml
@@ -92,7 +92,7 @@ Item {
rightDoorOpened: root.rightDoorOpened
trunkOpened: root.trunkOpened
- onNewRoofOpenProgressRequested: root.newRoofOpenProgressRequested(progress)
+ onNewRoofOpenProgressRequested: function(progress) { root.newRoofOpenProgressRequested(progress) }
}
FrontDoorsPanel {
diff --git a/apps/com.luxoft.vehicle/panels/FrontDoorsPanel.qml b/apps/com.luxoft.vehicle/panels/FrontDoorsPanel.qml
index eb67fd94..bcf55926 100644
--- a/apps/com.luxoft.vehicle/panels/FrontDoorsPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/FrontDoorsPanel.qml
@@ -32,7 +32,7 @@
import QtQuick 2.9
import QtQuick.Layouts 1.3
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
import shared.Sizes 1.0
diff --git a/apps/com.luxoft.vehicle/panels/RoofPanel.qml b/apps/com.luxoft.vehicle/panels/RoofPanel.qml
index 0c3918a3..29ac8b5e 100644
--- a/apps/com.luxoft.vehicle/panels/RoofPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/RoofPanel.qml
@@ -32,7 +32,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.3
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
import QtQuick.Layouts 1.3
import shared.Sizes 1.0
diff --git a/apps/com.luxoft.vehicle/panels/TrunkPanel.qml b/apps/com.luxoft.vehicle/panels/TrunkPanel.qml
index b2460d12..6e9832f9 100644
--- a/apps/com.luxoft.vehicle/panels/TrunkPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/TrunkPanel.qml
@@ -31,7 +31,7 @@
****************************************************************************/
import QtQuick 2.9
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects 1.0
import shared.animations 1.0
diff --git a/apps/com.luxoft.vehicle/panels/Vehicle2DPanel.qml b/apps/com.luxoft.vehicle/panels/Vehicle2DPanel.qml
index 26f221d9..2fcc661a 100644
--- a/apps/com.luxoft.vehicle/panels/Vehicle2DPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/Vehicle2DPanel.qml
@@ -30,8 +30,7 @@
****************************************************************************/
import QtQuick 2.9
-import QtGraphicalEffects 1.12
-
+import Qt5Compat.GraphicalEffects
import shared.animations 1.0
import shared.Sizes 1.0
diff --git a/apps/com.luxoft.vehicle/panels/Vehicle3DControlPanel.qml b/apps/com.luxoft.vehicle/panels/Vehicle3DControlPanel.qml
index a8b84056..215317e8 100644
--- a/apps/com.luxoft.vehicle/panels/Vehicle3DControlPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/Vehicle3DControlPanel.qml
@@ -32,7 +32,6 @@
import QtQuick 2.9
import QtQuick.Layouts 1.3
-import QtGraphicalEffects 1.0
import QtQuick.Controls 2.2
import shared.controls 1.0
@@ -84,7 +83,7 @@ Item {
SupportPanel { id: supportPanel; objectName: "vehicleSupportPanel" }
EnergyPanel {
objectName: "vehicleEnergyPanel"
- onIntentToMapRequested: root.intentToMapRequested(intentId, params)
+ onIntentToMapRequested: function(intentId) { root.intentToMapRequested(intentId, params) }
}
DoorsPanel {
id: doorsPanel
@@ -92,7 +91,7 @@ Item {
onLeftDoorClicked: root.leftDoorClicked()
onRightDoorClicked: root.rightDoorClicked()
onTrunkClicked: root.trunkClicked()
- onNewRoofOpenProgressRequested: root.newRoofOpenProgressRequested(progress)
+ onNewRoofOpenProgressRequested: function(progress) { root.newRoofOpenProgressRequested(progress) }
}
TiresPanel { objectName: "vehicleTiresPanel" }
Settings3DPanel {
diff --git a/apps/com.luxoft.vehicle/panels/Vehicle3DPanel.qml b/apps/com.luxoft.vehicle/panels/Vehicle3DPanel.qml
index 1c0068ff..2cb1202c 100644
--- a/apps/com.luxoft.vehicle/panels/Vehicle3DPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/Vehicle3DPanel.qml
@@ -146,7 +146,7 @@ Item {
FrameAction {
id: frameCounter
property real dtime: 0.0
- onTriggered: {
+ onTriggered: function(dt) {
if (renderSettings.renderPolicy === RenderSettings.Always) {
dtime += dt;
if (dtime > 5.0) {
diff --git a/apps/com.luxoft.vehicle/panels/VehicleProxyPanel.qml b/apps/com.luxoft.vehicle/panels/VehicleProxyPanel.qml
index 6a2b02e4..06f1141e 100644
--- a/apps/com.luxoft.vehicle/panels/VehicleProxyPanel.qml
+++ b/apps/com.luxoft.vehicle/panels/VehicleProxyPanel.qml
@@ -31,7 +31,6 @@
import QtQuick 2.9
import QtQuick.Controls 2.5
-import QtGraphicalEffects 1.12
import shared.Sizes 1.0
import shared.Style 1.0
diff --git a/apps/com.luxoft.vehicle/views/VehicleView.qml b/apps/com.luxoft.vehicle/views/VehicleView.qml
index 04f857ee..bffae32b 100644
--- a/apps/com.luxoft.vehicle/views/VehicleView.qml
+++ b/apps/com.luxoft.vehicle/views/VehicleView.qml
@@ -195,11 +195,11 @@ Item {
onLeftDoorClicked: root.store.setLeftDoor()
onRightDoorClicked: root.store.setRightDoor()
onTrunkClicked: root.store.setTrunk()
- onNewRoofOpenProgressRequested: root.store.setRoofOpenProgress(progress)
+ onNewRoofOpenProgressRequested: function(progress) { root.store.setRoofOpenProgress(progress) }
- onRuntimeChanged: { root.store.setRuntime(runtime); }
+ onRuntimeChanged: function(runtime) { root.store.setRuntime(runtime) }
- onQualityChanged: {
+ onQualityChanged: function(quality) {
if (root.store.model3DVersion !== quality) {
root.store.model3DVersion = quality;
root.store.setModelQuality(quality);
@@ -207,6 +207,6 @@ Item {
}
onShowNotificationAboutChange: store.showNotificationAboutChange()
- onIntentToMapRequested: { root.store.createIntentToMap(intentId, params) }
+ onIntentToMapRequested: function(intentId, params) { root.store.createIntentToMap(intentId, params) }
}
}
diff --git a/apps/com.pelagicore.apps.settings/controls/ColorSelector.qml b/apps/com.pelagicore.apps.settings/controls/ColorSelector.qml
index 213debd1..f08f2ea7 100644
--- a/apps/com.pelagicore.apps.settings/controls/ColorSelector.qml
+++ b/apps/com.pelagicore.apps.settings/controls/ColorSelector.qml
@@ -46,14 +46,15 @@ Control {
background: Image {
width: Sizes.dp(sourceSize.width)
- height: width
+ height: Sizes.dp(sourceSize.height)
source: Style.image("colorSelector/color-wheel")
+ fillMode: Image.PreserveAspectFit
Image {
//selected color overlay
- height: Sizes.dp(sourceSize.width)
- width: Sizes.dp(sourceSize.height)
+ anchors.fill: parent
source: Style.image("colorSelector/"+Style.accentColor)
+ fillMode: parent.fillMode
}
MouseArea {
diff --git a/apps/com.pelagicore.apps.settings/panels/ColorsPanel.qml b/apps/com.pelagicore.apps.settings/panels/ColorsPanel.qml
index 22db493d..3a3c0247 100644
--- a/apps/com.pelagicore.apps.settings/panels/ColorsPanel.qml
+++ b/apps/com.pelagicore.apps.settings/panels/ColorsPanel.qml
@@ -46,7 +46,7 @@ Control {
id: colorsChart
width: root.availableWidth
height: root.availableHeight
- onAccentColorRequested: {
+ onAccentColorRequested: function(accentColor) {
root.accentColorRequested(accentColor);
}
}
diff --git a/apps/com.pelagicore.apps.settings/store/RootStore.qml b/apps/com.pelagicore.apps.settings/store/RootStore.qml
index 8abbdb6d..84c5a519 100644
--- a/apps/com.pelagicore.apps.settings/store/RootStore.qml
+++ b/apps/com.pelagicore.apps.settings/store/RootStore.qml
@@ -99,7 +99,7 @@ QtObject {
}
readonly property UISettings uiSettings: UISettings {
- onAccentColorChanged: {
+ onAccentColorChanged: function(accentColor) {
root.accentColorsModel.forEach(function(element) {
element.selected = Qt.colorEqual(element.color, accentColor);
});
diff --git a/apps/com.pelagicore.apps.settings/views/SettingsView.qml b/apps/com.pelagicore.apps.settings/views/SettingsView.qml
index c19f44fa..c49b8a57 100644
--- a/apps/com.pelagicore.apps.settings/views/SettingsView.qml
+++ b/apps/com.pelagicore.apps.settings/views/SettingsView.qml
@@ -240,7 +240,7 @@ Control {
anchors.fill: parent
visible: toolsColumn.currentIcon === 'ic-color'
model: store.accentColorsModel
- onAccentColorRequested: store.updateAccentColor(accentColor)
+ onAccentColorRequested: function(accentColor) { store.updateAccentColor(accentColor) }
}
}
}
diff --git a/apps/com.pelagicore.calendar/panels/+lucee/CalendarWidgetPanel.qml b/apps/com.pelagicore.calendar/panels/+lucee/CalendarWidgetPanel.qml
index cb7f351c..6a440633 100644
--- a/apps/com.pelagicore.calendar/panels/+lucee/CalendarWidgetPanel.qml
+++ b/apps/com.pelagicore.calendar/panels/+lucee/CalendarWidgetPanel.qml
@@ -32,9 +32,8 @@
import QtQuick 2.8
import QtQml 2.2
-import QtQuick.Controls 2.2
+import QtQuick.Controls
import QtQuick.Layouts 1.3
-import Qt.labs.calendar 1.0
import shared.utils 1.0
import shared.animations 1.0
import "../controls" 1.0
diff --git a/apps/com.pelagicore.calendar/panels/CalendarGridPanel.qml b/apps/com.pelagicore.calendar/panels/CalendarGridPanel.qml
index 0686cfc4..ee5e2f15 100644
--- a/apps/com.pelagicore.calendar/panels/CalendarGridPanel.qml
+++ b/apps/com.pelagicore.calendar/panels/CalendarGridPanel.qml
@@ -31,9 +31,8 @@
****************************************************************************/
import QtQuick 2.8
-import QtQuick.Controls 2.2
+import QtQuick.Controls
import QtQuick.Layouts 1.2
-import Qt.labs.calendar 1.0
import shared.utils 1.0
import shared.Style 1.0
import shared.Sizes 1.0
diff --git a/apps/com.pelagicore.calendar/panels/CalendarMaximizedPanel.qml b/apps/com.pelagicore.calendar/panels/CalendarMaximizedPanel.qml
index 6eee833c..1144db11 100644
--- a/apps/com.pelagicore.calendar/panels/CalendarMaximizedPanel.qml
+++ b/apps/com.pelagicore.calendar/panels/CalendarMaximizedPanel.qml
@@ -31,9 +31,8 @@
****************************************************************************/
import QtQuick 2.8
-import QtQuick.Controls 2.2
+import QtQuick.Controls
import QtQuick.Layouts 1.3
-import Qt.labs.calendar 1.0
import shared.animations 1.0
import shared.controls 1.0
import shared.utils 1.0
diff --git a/apps/com.pelagicore.calendar/panels/NextCalendarPanel.qml b/apps/com.pelagicore.calendar/panels/NextCalendarPanel.qml
index a37b078c..79228288 100644
--- a/apps/com.pelagicore.calendar/panels/NextCalendarPanel.qml
+++ b/apps/com.pelagicore.calendar/panels/NextCalendarPanel.qml
@@ -31,9 +31,8 @@
****************************************************************************/
import QtQuick 2.8
-import QtQuick.Controls 2.2
+import QtQuick.Controls
import QtQuick.Layouts 1.2
-import Qt.labs.calendar 1.0
import shared.utils 1.0
import shared.controls 1.0
import shared.Style 1.0
diff --git a/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml b/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml
index 740824cb..35944401 100644
--- a/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml
+++ b/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml
@@ -31,9 +31,8 @@
****************************************************************************/
import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick.Controls
import QtQuick.Layouts 1.2
-import Qt.labs.calendar 1.0
import shared.utils 1.0
import shared.controls 1.0
import shared.Style 1.0
diff --git a/apps/com.pelagicore.calendar/views/+lucee/CalendarView.qml b/apps/com.pelagicore.calendar/views/+lucee/CalendarView.qml
index a61ea82e..be4ece49 100644
--- a/apps/com.pelagicore.calendar/views/+lucee/CalendarView.qml
+++ b/apps/com.pelagicore.calendar/views/+lucee/CalendarView.qml
@@ -31,9 +31,8 @@
****************************************************************************/
import QtQuick 2.8
-import QtQuick.Controls 2.2
+import QtQuick.Controls
import QtQuick.Layouts 1.3
-import Qt.labs.calendar 1.0
import shared.animations 1.0
import shared.controls 1.0
import shared.utils 1.0
diff --git a/apps/com.pelagicore.calendar/views/CalendarView.qml b/apps/com.pelagicore.calendar/views/CalendarView.qml
index d2ba3328..1c729191 100644
--- a/apps/com.pelagicore.calendar/views/CalendarView.qml
+++ b/apps/com.pelagicore.calendar/views/CalendarView.qml
@@ -31,9 +31,8 @@
****************************************************************************/
import QtQuick 2.8
-import QtQuick.Controls 2.2
+import QtQuick.Controls
import QtQuick.Layouts 1.3
-import Qt.labs.calendar 1.0
import shared.animations 1.0
import shared.controls 1.0
import shared.utils 1.0
diff --git a/apps/com.pelagicore.climate/Main.qml b/apps/com.pelagicore.climate/Main.qml
index a2d9a761..fab1958d 100644
--- a/apps/com.pelagicore.climate/Main.qml
+++ b/apps/com.pelagicore.climate/Main.qml
@@ -59,7 +59,7 @@ NeptuneWindow {
}
}
- onWindowPropertyChanged: {
+ onWindowPropertyChanged: function(name, value) {
if (name === "neptuneLanguageLocale") {
climateStore.measurementSystem = Qt.locale().measurementSystem
}
diff --git a/apps/com.pelagicore.climate/panels/ClimateAirFlowPanel.qml b/apps/com.pelagicore.climate/panels/ClimateAirFlowPanel.qml
index 912737a3..e406e3a2 100644
--- a/apps/com.pelagicore.climate/panels/ClimateAirFlowPanel.qml
+++ b/apps/com.pelagicore.climate/panels/ClimateAirFlowPanel.qml
@@ -33,7 +33,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
import "../helpers" 1.0
import shared.animations 1.0
diff --git a/apps/com.pelagicore.climate/stores/ClimateStore.qml b/apps/com.pelagicore.climate/stores/ClimateStore.qml
index 7948a391..d8025f95 100644
--- a/apps/com.pelagicore.climate/stores/ClimateStore.qml
+++ b/apps/com.pelagicore.climate/stores/ClimateStore.qml
@@ -31,14 +31,14 @@
****************************************************************************/
import QtQuick 2.8
-import QtIvi.VehicleFunctions 1.0
+import QtInterfaceFramework.VehicleFunctions 1.0
QtObject {
id: root
property ClimateControl climateControl: ClimateControl {
discoveryMode: ClimateControl.AutoDiscovery
- onIsInitializedChanged: {
+ onIsInitializedChanged: function() {
if (isInitialized) {
leftSeat.setValue(21.5)
rightSeat.setValue(21.5)
@@ -173,7 +173,7 @@ QtObject {
// ClimateControl.airfloDirections is a bitfield. Manipulating bitfields is a PITA.
// Convert it into a nice set of booleans instead.
- // TODO: Change the QtIVI interface from bitfield to booleans so that this wrapping is no longer needed
+ // TODO: Change the QtInterfaceFramework interface from bitfield to booleans so that this wrapping is no longer needed
property QtObject airflow: QtObject {
id: airflow
property bool _lock: false
diff --git a/apps/com.pelagicore.downloads/stores/DownloadsStates.qml b/apps/com.pelagicore.downloads/stores/DownloadsStates.qml
index 6b558aab..78b27e8f 100644
--- a/apps/com.pelagicore.downloads/stores/DownloadsStates.qml
+++ b/apps/com.pelagicore.downloads/stores/DownloadsStates.qml
@@ -106,7 +106,7 @@ DSM.StateMachine {
}
DSM.SignalTransition {
targetState: serverOnMaintanceState
- signal: appStoreConfig.serverOnMaintanceState
+ signal: appStoreConfig.serverOnMaintance
}
}
diff --git a/apps/com.pelagicore.hud/panels/NaviPanel.qml b/apps/com.pelagicore.hud/panels/NaviPanel.qml
index 9581c30e..6c8e5b3d 100644
--- a/apps/com.pelagicore.hud/panels/NaviPanel.qml
+++ b/apps/com.pelagicore.hud/panels/NaviPanel.qml
@@ -30,8 +30,7 @@
****************************************************************************/
import QtQuick 2.10
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
+import QtQuick.Controls
import shared.Style 1.0
import shared.Sizes 1.0
import shared.animations 1.0
@@ -57,7 +56,8 @@ Item {
anchors.verticalCenter: parent.verticalCenter
height: Sizes.dp(120)
width: Sizes.dp(20)
- orientation: Qt.Vertical
+ transformOrigin: Item.Center
+ rotation: 270
visible: opacity > 0.0
opacity: root.nextTurnDistance <= 300 && root.nextTurnDistanceMeasuredIn === "m" ? 1 : 0
Behavior on opacity { DefaultNumberAnimation {} }
@@ -65,19 +65,17 @@ Item {
value: root.nextTurnDistance <= 300 && root.nextTurnDistanceMeasuredIn === "m"
? root.nextTurnDistance / 300 : 0.0
- style: ProgressBarStyle {
- background: Rectangle {
- radius: 2
- color: "transparent"
- border.color: "gray"
- border.width: Sizes.dp(1)
- implicitHeight: Sizes.dp(200)
- implicitWidth: Sizes.dp(20)
- }
- progress: Rectangle {
- color: "lightsteelblue"
- border.color: "steelblue"
- }
+ background: Rectangle {
+ radius: 2
+ color: "transparent"
+ border.color: "gray"
+ border.width: Sizes.dp(1)
+ implicitHeight: Sizes.dp(200)
+ implicitWidth: Sizes.dp(20)
+ }
+ contentItem: Rectangle {
+ color: "lightsteelblue"
+ border.color: "steelblue"
}
}
}
diff --git a/apps/com.pelagicore.map/views/MapView.qml b/apps/com.pelagicore.map/views/MapView.qml
index 2fee8c35..6d34bc3c 100644
--- a/apps/com.pelagicore.map/views/MapView.qml
+++ b/apps/com.pelagicore.map/views/MapView.qml
@@ -35,7 +35,7 @@ import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtPositioning 5.9
import QtLocation 5.9
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
import Qt.labs.platform 1.0
diff --git a/apps/com.pelagicore.music/controls/+lucee/MusicControls.qml b/apps/com.pelagicore.music/controls/+lucee/MusicControls.qml
index 217e32f2..361524d9 100644
--- a/apps/com.pelagicore.music/controls/+lucee/MusicControls.qml
+++ b/apps/com.pelagicore.music/controls/+lucee/MusicControls.qml
@@ -31,6 +31,7 @@
****************************************************************************/
import QtQuick 2.10
+import Qt5Compat.GraphicalEffects
import shared.utils 1.0
import shared.controls 1.0
import QtQuick.Controls 2.3
@@ -55,16 +56,19 @@ Row {
icon.color: "white"
onClicked: root.playClicked()
- background: Image {
- id: playButtonBackground
+ background: Item {
anchors.centerIn: parent
- width: Sizes.dp(sourceSize.width)
- height: Sizes.dp(sourceSize.height)
- source: Style.image("ic_button-bg")
- fillMode: Image.PreserveAspectFit
-
- ScalableColorOverlay {
- anchors.fill: parent
+ width: playButtonBackground.width
+ height: playButtonBackground.height
+ Image {
+ id: playButtonBackground
+ width: Sizes.dp(sourceSize.width)
+ height: Sizes.dp(sourceSize.height)
+ source: Style.image("ic_button-bg")
+ fillMode: Image.PreserveAspectFit
+ }
+ ColorOverlay {
+ anchors.fill: playButtonBackground
source: playButtonBackground
color: Style.accentColor
}
diff --git a/apps/com.pelagicore.music/controls/MusicControls.qml b/apps/com.pelagicore.music/controls/MusicControls.qml
index c06ed2d7..02837107 100644
--- a/apps/com.pelagicore.music/controls/MusicControls.qml
+++ b/apps/com.pelagicore.music/controls/MusicControls.qml
@@ -31,6 +31,7 @@
****************************************************************************/
import QtQuick 2.10
+import Qt5Compat.GraphicalEffects
import shared.utils 1.0
import shared.controls 1.0
import QtQuick.Controls 2.3
@@ -66,16 +67,19 @@ Row {
icon.color: "white"
onClicked: root.playClicked()
- background: Image {
- id: playButtonBackground
+ background: Item {
anchors.centerIn: parent
- width: Sizes.dp(sourceSize.width)
- height: Sizes.dp(sourceSize.height)
- source: Style.image("ic_button-bg")
- fillMode: Image.PreserveAspectFit
-
- ScalableColorOverlay {
- anchors.fill: parent
+ width: playButtonBackground.width
+ height: playButtonBackground.height
+ Image {
+ id: playButtonBackground
+ width: Sizes.dp(sourceSize.width)
+ height: Sizes.dp(sourceSize.height)
+ source: Style.image("ic_button-bg")
+ fillMode: Image.PreserveAspectFit
+ }
+ ColorOverlay {
+ anchors.fill: playButtonBackground
source: playButtonBackground
color: Style.accentColor
}
diff --git a/apps/com.pelagicore.music/panels/AlbumArtDetailPanel.qml b/apps/com.pelagicore.music/panels/AlbumArtDetailPanel.qml
index 34e15cd6..dff6fc04 100644
--- a/apps/com.pelagicore.music/panels/AlbumArtDetailPanel.qml
+++ b/apps/com.pelagicore.music/panels/AlbumArtDetailPanel.qml
@@ -31,7 +31,7 @@
****************************************************************************/
import QtQuick 2.11
-import QtGraphicalEffects 1.12
+import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.2
import shared.utils 1.0
import shared.animations 1.0
@@ -109,12 +109,11 @@ Item {
fillMode: Image.PreserveAspectCrop
}
- GaussianBlur {
+ FastBlur {
id: undefinedBlur
anchors.fill: albumArtUndefined
source: albumArtUndefined
radius: 8
- samples: 16
visible: false
}
@@ -139,12 +138,11 @@ Item {
fillMode: Image.PreserveAspectCrop
}
- GaussianBlur {
+ FastBlur {
id: albumArtBlur
anchors.fill: albumArt
source: albumArt
radius: 8
- samples: 16
visible: false
}
@@ -310,16 +308,19 @@ Item {
icon.color: "white"
onClicked: root.playClicked();
- background: Image {
- id: playButtonBackground
+ background: Item {
anchors.centerIn: parent
- width: Sizes.dp(sourceSize.width)
- height: Sizes.dp(sourceSize.height)
- source: Style.image("ic_button-bg")
- fillMode: Image.PreserveAspectFit
-
- ScalableColorOverlay {
- anchors.fill: parent
+ width: playButtonBackground.width
+ height: playButtonBackground.height
+ Image {
+ id: playButtonBackground
+ width: Sizes.dp(sourceSize.width)
+ height: Sizes.dp(sourceSize.height)
+ source: Style.image("ic_button-bg")
+ fillMode: Image.PreserveAspectFit
+ }
+ ColorOverlay {
+ anchors.fill: playButtonBackground
source: playButtonBackground
color: Style.accentColor
}
diff --git a/apps/com.pelagicore.music/panels/MusicPlayQueuePanel.qml b/apps/com.pelagicore.music/panels/MusicPlayQueuePanel.qml
index b1a9cd87..6a014911 100644
--- a/apps/com.pelagicore.music/panels/MusicPlayQueuePanel.qml
+++ b/apps/com.pelagicore.music/panels/MusicPlayQueuePanel.qml
@@ -31,7 +31,6 @@
****************************************************************************/
import QtQuick 2.8
-import QtGraphicalEffects 1.13
import shared.utils 1.0
import shared.controls 1.0
import shared.Sizes 1.0
diff --git a/apps/com.pelagicore.music/stores/MusicStore.qml b/apps/com.pelagicore.music/stores/MusicStore.qml
index a69ef5e3..d7895880 100644
--- a/apps/com.pelagicore.music/stores/MusicStore.qml
+++ b/apps/com.pelagicore.music/stores/MusicStore.qml
@@ -33,8 +33,8 @@
import QtQuick 2.8
import QtApplicationManager.Application 2.0
import QtApplicationManager 2.0
-import QtIvi 1.0
-import QtIvi.Media 1.0
+import QtInterfaceFramework
+import QtInterfaceFramework.Media
import shared.utils 1.0
Store {
@@ -77,10 +77,12 @@ Store {
property string headerTextInArtistsView: ""
property string headerTextInAlbumsView: ""
- property SearchAndBrowseModel searchAndBrowseModel: SearchAndBrowseModel {
+ property FilterAndBrowseModel searchAndBrowseModel: FilterAndBrowseModel {
id: searchBrowseModel
contentType: ""
- onContentTypeChanged: console.log(Logging.apps, "Music App::Content Type Change: ", contentType)
+ onContentTypeChanged: function(contentType) {
+ console.log(Logging.apps, "Music App::Content Type Change: ", contentType)
+ }
serviceObject: root.player.serviceObject
onCountChanged: {
@@ -107,7 +109,7 @@ Store {
readonly property MediaIndexerControl indexerControl: MediaIndexerControl {
property bool databaseReloaded: false
property bool modelPopulated: false
- onProgressChanged: {
+ onProgressChanged: function(progress) {
// SearchAndBrowseModel need to be reloaded when indexing process reach 20 %
// to get the music data and after indexing process is done.
// Without reloading the model, Neptune 3 won't see any music during the first
diff --git a/apps/com.pelagicore.music/views/+lucee/WidgetContentView.qml b/apps/com.pelagicore.music/views/+lucee/WidgetContentView.qml
index cd824bb9..2ef9095c 100644
--- a/apps/com.pelagicore.music/views/+lucee/WidgetContentView.qml
+++ b/apps/com.pelagicore.music/views/+lucee/WidgetContentView.qml
@@ -31,7 +31,7 @@
****************************************************************************/
import QtQuick 2.8
-import QtGraphicalEffects 1.12
+import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
diff --git a/apps/com.pelagicore.music/views/WidgetContentView.qml b/apps/com.pelagicore.music/views/WidgetContentView.qml
index c1ab5c80..f2a051ff 100644
--- a/apps/com.pelagicore.music/views/WidgetContentView.qml
+++ b/apps/com.pelagicore.music/views/WidgetContentView.qml
@@ -85,7 +85,7 @@ Item {
listView.model: store.musicPlaylist
listView.interactive: false
musicPlaying: root.store.playing
- onItemClicked: {
+ onItemClicked: function(index) {
store.musicPlaylist.currentIndex = index;
store.player.play();
}
@@ -145,7 +145,7 @@ Item {
visible: opacity > 0
value: store.currentTrackPosition
progressText: store.elapsedTime + " / " + store.totalTime
- onUpdatePosition: store.updatePosition(value)
+ onUpdatePosition: function(value) { store.updatePosition(value) }
}
MusicTools {
diff --git a/apps/com.pelagicore.phone/Main.qml b/apps/com.pelagicore.phone/Main.qml
index 2fda4a84..37a1e780 100644
--- a/apps/com.pelagicore.phone/Main.qml
+++ b/apps/com.pelagicore.phone/Main.qml
@@ -35,7 +35,6 @@ import application.windows 1.0
import shared.utils 1.0
import shared.animations 1.0
import shared.controls 1.0
-import QtGraphicalEffects 1.0
import shared.Style 1.0
import shared.Sizes 1.0
diff --git a/apps/com.pelagicore.phone/controls/BlurredImageBackground.qml b/apps/com.pelagicore.phone/controls/BlurredImageBackground.qml
index a4b5a3aa..ffc89d3a 100644
--- a/apps/com.pelagicore.phone/controls/BlurredImageBackground.qml
+++ b/apps/com.pelagicore.phone/controls/BlurredImageBackground.qml
@@ -31,7 +31,7 @@
****************************************************************************/
import QtQuick 2.8
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
import shared.Sizes 1.0
diff --git a/apps/com.pelagicore.phone/controls/RoundImage.qml b/apps/com.pelagicore.phone/controls/RoundImage.qml
index f11486a2..bf7157ea 100644
--- a/apps/com.pelagicore.phone/controls/RoundImage.qml
+++ b/apps/com.pelagicore.phone/controls/RoundImage.qml
@@ -32,7 +32,7 @@
import QtQuick 2.8
import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
import shared.Sizes 1.0
diff --git a/apps/com.pelagicore.phone/controls/WidgetContact.qml b/apps/com.pelagicore.phone/controls/WidgetContact.qml
index 9f0a6cf7..d188276c 100644
--- a/apps/com.pelagicore.phone/controls/WidgetContact.qml
+++ b/apps/com.pelagicore.phone/controls/WidgetContact.qml
@@ -33,7 +33,7 @@
import QtQuick 2.0
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
import shared.effects 1.0
import shared.animations 1.0
@@ -121,16 +121,20 @@ Control {
icon.name: "ic-call-contrast"
icon.color: "white"
- background: Image {
- id: callButtonBackground
+ background: Item {
anchors.centerIn: parent
- width: Sizes.dp(sourceSize.width)
- height: Sizes.dp(sourceSize.height)
- source: Style.image("ic_button-bg")
- fillMode: Image.PreserveAspectFit
+ width: callButtonBackground.width
+ height: callButtonBackground.height
+ Image {
+ id: callButtonBackground
+ width: Sizes.dp(sourceSize.width)
+ height: Sizes.dp(sourceSize.height)
+ source: Style.image("ic_button-bg")
+ fillMode: Image.PreserveAspectFit
- ScalableColorOverlay {
- anchors.fill: parent
+ }
+ ColorOverlay {
+ anchors.fill: callButtonBackground
source: callButtonBackground
color: Style.accentColor
}
diff --git a/apps/com.pelagicore.phone/stores/PhoneStore.qml b/apps/com.pelagicore.phone/stores/PhoneStore.qml
index da305fe2..ae3b28fe 100644
--- a/apps/com.pelagicore.phone/stores/PhoneStore.qml
+++ b/apps/com.pelagicore.phone/stores/PhoneStore.qml
@@ -4,7 +4,7 @@
** Copyright (C) 2018 Pelagicore AG
** Contact: https://www.qt.io/licensing/
**
-** This file is part of the Neptune IVI UI.
+** This file is part of the Neptune 3 UI.
**
** $QT_BEGIN_LICENSE:GPL-QTAS$
** Commercial License Usage
diff --git a/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml b/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml
index d4ab3ee4..e67bb021 100644
--- a/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml
+++ b/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml
@@ -124,7 +124,7 @@ Item {
source: "../assets/profile_photos/%1.png".arg(model.handle)
lastItem: (index === (favorites1Row.model.count - 1))
maximized: (root.state === "Maximized")
- onCallWidgetClicked: { root.store.startCall(handle); }
+ onCallWidgetClicked: function(handle) { root.store.startCall(handle); }
enableOpacityMasks: store.allowOpenGLContent
}
PageIndicator {
diff --git a/apps/com.pelagicore.phone/views/PhoneView.qml b/apps/com.pelagicore.phone/views/PhoneView.qml
index 0198c5c8..2b457ea9 100644
--- a/apps/com.pelagicore.phone/views/PhoneView.qml
+++ b/apps/com.pelagicore.phone/views/PhoneView.qml
@@ -97,7 +97,7 @@ Item {
state: root.state
store: root.store
ongoingCall: root.store.ongoingCall
- onCallEndRequested: root.store.endCall(handle)
+ onCallEndRequested: function(handle) { root.store.endCall(handle) }
onKeypadRequested: {
toolsColumn.currentIndex = 3; // keypad
root.activateApp();
diff --git a/apps/com.pelagicore.tuner/controls/MusicControls.qml b/apps/com.pelagicore.tuner/controls/MusicControls.qml
index e0e25197..5d6758d5 100644
--- a/apps/com.pelagicore.tuner/controls/MusicControls.qml
+++ b/apps/com.pelagicore.tuner/controls/MusicControls.qml
@@ -31,6 +31,7 @@
****************************************************************************/
import QtQuick 2.10
+import Qt5Compat.GraphicalEffects
import shared.utils 1.0
import shared.controls 1.0
import QtQuick.Controls 2.3
@@ -64,16 +65,19 @@ Row {
icon.color: "white"
onClicked: root.playClicked()
- background: Image {
- id: playButtonBackground
+ background: Item {
anchors.centerIn: parent
- width: Sizes.dp(sourceSize.width)
- height: Sizes.dp(sourceSize.height)
- source: Style.image("ic_button-bg")
- fillMode: Image.PreserveAspectFit
-
- ScalableColorOverlay {
- anchors.fill: parent
+ width: playButtonBackground.width
+ height: playButtonBackground.height
+ Image {
+ id: playButtonBackground
+ width: Sizes.dp(sourceSize.width)
+ height: Sizes.dp(sourceSize.height)
+ source: Style.image("ic_button-bg")
+ fillMode: Image.PreserveAspectFit
+ }
+ ColorOverlay {
+ anchors.fill: playButtonBackground
source: playButtonBackground
color: Style.accentColor
}
diff --git a/apps/com.pelagicore.tuner/controls/StationInfoColumn.qml b/apps/com.pelagicore.tuner/controls/StationInfoColumn.qml
index 8bfaddfb..6dc0bd33 100644
--- a/apps/com.pelagicore.tuner/controls/StationInfoColumn.qml
+++ b/apps/com.pelagicore.tuner/controls/StationInfoColumn.qml
@@ -33,7 +33,6 @@
import QtQuick 2.8
import QtQuick.Layouts 1.2
import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
import shared.utils 1.0
import shared.controls 1.0
diff --git a/apps/com.pelagicore.tuner/controls/TunerSlider.qml b/apps/com.pelagicore.tuner/controls/TunerSlider.qml
index b10f2113..2bda18a1 100644
--- a/apps/com.pelagicore.tuner/controls/TunerSlider.qml
+++ b/apps/com.pelagicore.tuner/controls/TunerSlider.qml
@@ -33,7 +33,7 @@
import QtQuick 2.8
import QtQuick.Layouts 1.2
import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
import shared.utils 1.0
import shared.controls 1.0
diff --git a/apps/com.pelagicore.tuner/stores/TunerStore.qml b/apps/com.pelagicore.tuner/stores/TunerStore.qml
index f05892e7..52da18cf 100644
--- a/apps/com.pelagicore.tuner/stores/TunerStore.qml
+++ b/apps/com.pelagicore.tuner/stores/TunerStore.qml
@@ -31,7 +31,7 @@
****************************************************************************/
import QtQuick 2.8
-import QtMultimedia 5.9
+import QtMultimedia
import QtApplicationManager.Application 2.0
import QtApplicationManager 2.0
import shared.utils 1.0
@@ -114,7 +114,7 @@ Store {
}
}
- // TODO: Simulation models. QtIVI models are not updated yet and only have two available stations.
+ // TODO: Simulation models. QtInterfaceFramework models are not updated yet and only have two available stations.
readonly property ListModel fm1Stations: ListModel {
ListElement {
freq: 87.5
diff --git a/apps/com.pelagicore.tuner/views/FullScreenBottomView.qml b/apps/com.pelagicore.tuner/views/FullScreenBottomView.qml
index 348ad3dd..940c0428 100644
--- a/apps/com.pelagicore.tuner/views/FullScreenBottomView.qml
+++ b/apps/com.pelagicore.tuner/views/FullScreenBottomView.qml
@@ -106,7 +106,7 @@ Item {
anchors.top: parent.top
height: parent.height
listView.model: root.store.currentPresetModel
- onItemClicked: {
+ onItemClicked: function(index) {
root.store.setFrequency(root.store.currentPresetModel.get(index).freq);
}
}
diff --git a/apps/com.theqtcompany.cluster/Main.qml b/apps/com.theqtcompany.cluster/Main.qml
index 2f9db8c3..f347134a 100644
--- a/apps/com.theqtcompany.cluster/Main.qml
+++ b/apps/com.theqtcompany.cluster/Main.qml
@@ -84,7 +84,7 @@ NeptuneWindow {
}
}
- onWindowPropertyChanged: {
+ onWindowPropertyChanged: function(name, value) {
if (name === "clusterUIMode") {
//set UI mode for cluster: no app or some app running under cluster view
clusterView.store.behaviourInterface.clusterUIMode = value
diff --git a/apps/com.theqtcompany.cluster/panels/+lucee/DialPowerPanel.qml b/apps/com.theqtcompany.cluster/panels/+lucee/DialPowerPanel.qml
index 2c0493b1..05dc0c36 100644
--- a/apps/com.theqtcompany.cluster/panels/+lucee/DialPowerPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/+lucee/DialPowerPanel.qml
@@ -31,7 +31,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
import QtQuick.Shapes 1.12
import shared.controls 1.0
import "../helpers" 1.0
diff --git a/apps/com.theqtcompany.cluster/panels/+lucee/DialSpeedPanel.qml b/apps/com.theqtcompany.cluster/panels/+lucee/DialSpeedPanel.qml
index 93ca9790..266f8d19 100644
--- a/apps/com.theqtcompany.cluster/panels/+lucee/DialSpeedPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/+lucee/DialSpeedPanel.qml
@@ -31,7 +31,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
import QtQuick.Shapes 1.12
import shared.controls 1.0
import "../helpers" 1.0
@@ -96,7 +96,6 @@ Item {
horizontalOffset: 0
verticalOffset: 0
radius: Sizes.dp(10)
- samples: 10
color: "gray"
source: speedRectangle
opacity: 0.7
diff --git a/apps/com.theqtcompany.cluster/panels/+lucee/GaugesPanel.qml b/apps/com.theqtcompany.cluster/panels/+lucee/GaugesPanel.qml
index 05c6966b..abf9aebf 100644
--- a/apps/com.theqtcompany.cluster/panels/+lucee/GaugesPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/+lucee/GaugesPanel.qml
@@ -32,7 +32,6 @@
import QtQuick 2.9
import shared.Sizes 1.0
import QtQuick.Shapes 1.12
-import QtGraphicalEffects 1.0
import QtQuick.Controls 2.2
/*
diff --git a/apps/com.theqtcompany.cluster/panels/+lucee/LuceeCircles.qml b/apps/com.theqtcompany.cluster/panels/+lucee/LuceeCircles.qml
index db3b2444..9936ce63 100644
--- a/apps/com.theqtcompany.cluster/panels/+lucee/LuceeCircles.qml
+++ b/apps/com.theqtcompany.cluster/panels/+lucee/LuceeCircles.qml
@@ -32,7 +32,7 @@
import QtQuick 2.12
import QtQuick.Shapes 1.12
import shared.Sizes 1.0
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.2
/*
diff --git a/apps/com.theqtcompany.cluster/panels/DialFramePanel.qml b/apps/com.theqtcompany.cluster/panels/DialFramePanel.qml
index d50bd5f8..36a68024 100644
--- a/apps/com.theqtcompany.cluster/panels/DialFramePanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/DialFramePanel.qml
@@ -32,7 +32,7 @@
****************************************************************************/
import QtQuick 2.9
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
import QtQuick.Shapes 1.0
import "../helpers" 1.0
import shared.Style 1.0
diff --git a/apps/com.theqtcompany.cluster/panels/DialPowerPanel.qml b/apps/com.theqtcompany.cluster/panels/DialPowerPanel.qml
index 73e452d8..aee69173 100644
--- a/apps/com.theqtcompany.cluster/panels/DialPowerPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/DialPowerPanel.qml
@@ -32,6 +32,7 @@
****************************************************************************/
import QtQuick 2.9
+import Qt5Compat.GraphicalEffects
import QtQuick.Controls 2.3
import "../helpers" 1.0
import shared.Style 1.0
diff --git a/apps/com.theqtcompany.cluster/panels/DialSpeedPanel.qml b/apps/com.theqtcompany.cluster/panels/DialSpeedPanel.qml
index f81d13ab..299040cb 100644
--- a/apps/com.theqtcompany.cluster/panels/DialSpeedPanel.qml
+++ b/apps/com.theqtcompany.cluster/panels/DialSpeedPanel.qml
@@ -33,7 +33,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
import QtQuick.Shapes 1.0
import shared.controls 1.0
import "../helpers" 1.0
diff --git a/apps/com.theqtcompany.cluster/panels/DonutGauge.qml b/apps/com.theqtcompany.cluster/panels/DonutGauge.qml
index b765f62e..5d39f06a 100644
--- a/apps/com.theqtcompany.cluster/panels/DonutGauge.qml
+++ b/apps/com.theqtcompany.cluster/panels/DonutGauge.qml
@@ -31,7 +31,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.2
-import QtGraphicalEffects 1.0
import QtQuick.Shapes 1.12
import shared.Sizes 1.0
diff --git a/apps/com.theqtcompany.cluster/panels/DrivingModeRange.qml b/apps/com.theqtcompany.cluster/panels/DrivingModeRange.qml
index 2d4b6e1b..29d420be 100644
--- a/apps/com.theqtcompany.cluster/panels/DrivingModeRange.qml
+++ b/apps/com.theqtcompany.cluster/panels/DrivingModeRange.qml
@@ -32,7 +32,6 @@
import QtQuick 2.12
import QtQuick.Shapes 1.12
import shared.Sizes 1.0
-import QtGraphicalEffects 1.0
import QtQuick.Controls 2.2
/*!
diff --git a/apps/com.theqtcompany.cluster/panels/GaugesPanel3D.qml b/apps/com.theqtcompany.cluster/panels/GaugesPanel3D.qml
index 849a64c2..22882880 100644
--- a/apps/com.theqtcompany.cluster/panels/GaugesPanel3D.qml
+++ b/apps/com.theqtcompany.cluster/panels/GaugesPanel3D.qml
@@ -34,7 +34,6 @@ import shared.Sizes 1.0
import shared.Style 1.0
import shared.utils 1.0
import QtQuick.Shapes 1.12
-import QtGraphicalEffects 1.0
import QtQuick.Controls 2.2
import QtStudio3D.OpenGL 2.5