summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Hallamaa <mikko.hallamaa@qt.io>2023-10-23 16:47:25 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-10-26 16:55:41 +0000
commit5361b332f89303781aa4f0e22d3830141045fe43 (patch)
treef23f28cc9052769eb4c72a7c76ea8a3870f35aa2
parent3cbf8c22ce2c80aed525480c99aa25d9501e47e8 (diff)
Refactor QML camera example "variant" type properties
QML camera example had custom properties with deprecated "variant" type. These now have the type replaced with a narrower type or "var". Task-number: QTBUG-113682 Pick-to: 6.5 Change-Id: I8767dc740d2189a00a5def875ebb847e229008b1 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> (cherry picked from commit a1cf6699b736629be731af6d8745a946f4c43354) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/multimedia/declarative-camera/CameraListPopup.qml4
-rw-r--r--examples/multimedia/declarative-camera/CameraPropertyPopup.qml4
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/multimedia/declarative-camera/CameraListPopup.qml b/examples/multimedia/declarative-camera/CameraListPopup.qml
index 5fd1384af..4d93f889a 100644
--- a/examples/multimedia/declarative-camera/CameraListPopup.qml
+++ b/examples/multimedia/declarative-camera/CameraListPopup.qml
@@ -7,8 +7,8 @@ Popup {
id: cameraListPopup
property alias model : view.model
- property variant currentValue
- property variant currentItem : model[view.currentIndex]
+ property cameraDevice currentValue
+ property cameraDevice currentItem : model[view.currentIndex]
property int itemWidth : 200
property int itemHeight : 50
diff --git a/examples/multimedia/declarative-camera/CameraPropertyPopup.qml b/examples/multimedia/declarative-camera/CameraPropertyPopup.qml
index 08c192d3e..dac2dec95 100644
--- a/examples/multimedia/declarative-camera/CameraPropertyPopup.qml
+++ b/examples/multimedia/declarative-camera/CameraPropertyPopup.qml
@@ -7,8 +7,8 @@ Popup {
id: propertyPopup
property alias model : view.model
- property variant currentValue
- property variant currentItem : model.get(view.currentIndex)
+ property var currentValue
+ property var currentItem : model.get(view.currentIndex)
property int itemWidth : 100
property int itemHeight : 70