summaryrefslogtreecommitdiffstats
path: root/examples/studio3d/qmldatainput/qml
diff options
context:
space:
mode:
authorJanne Kangas <janne.kangas@qt.io>2019-05-14 11:02:30 +0300
committerJanne Kangas <janne.kangas@qt.io>2019-06-11 11:19:32 +0300
commit24bdd648eb1724b50594408de4bfbf1f73a755d1 (patch)
tree215583d3bc369b3bac82819589cc62522789a27e /examples/studio3d/qmldatainput/qml
parente366719a6ca814d3a1706e7ad731ff6655f4f59d (diff)
Make datainput metadata keys constant Q_PROPERTY
Remove invokable datainputKeys and make it a datainput property instead. In OpenGL RT this is a constant property as metadata is read-only property. Also update qmldatainput example. Change-Id: Ic9037f831b4072481ad5b2fac78ecc68db6808b2 Task-id: QT3DS-3625 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'examples/studio3d/qmldatainput/qml')
-rw-r--r--examples/studio3d/qmldatainput/qml/qmldatainput/main.qml10
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/studio3d/qmldatainput/qml/qmldatainput/main.qml b/examples/studio3d/qmldatainput/qml/qmldatainput/main.qml
index ab50796..7d55f73 100644
--- a/examples/studio3d/qmldatainput/qml/qmldatainput/main.qml
+++ b/examples/studio3d/qmldatainput/qml/qmldatainput/main.qml
@@ -94,7 +94,7 @@ Item {
+ (modelData.max !== 0 ? "\n range min: " + modelData.min
+ "\n range max: " + modelData.max
: "")
- + " \n metadata keys: [" + modelData.metadataKeys() + "]"
+ + " \n metadata keys: [" + modelData.metadataKeys + "]"
font.pointSize: 6
}
}
@@ -113,10 +113,6 @@ Item {
property string inputString: ""
property variant inputVariant: 0
- onPresentationLoaded: {
- diList.updateModel();
- }
-
// A changing property to demonstrate DataInput
NumberAnimation {
target: studio3D
@@ -179,6 +175,10 @@ Item {
id: presentation
source: "qrc:/presentation/datainput.uia"
+
+ onDataInputsReady: {
+ diList.updateModel();
+ }
DataInput {
// Name must match the data input name specified in the presentation
name: "rangeInput"