aboutsummaryrefslogtreecommitdiffstats
path: root/apps/com.luxoft.vehicle
diff options
context:
space:
mode:
Diffstat (limited to 'apps/com.luxoft.vehicle')
-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
9 files changed, 12 insertions, 15 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) }
}
}