summaryrefslogtreecommitdiffstats
path: root/examples/studio3d/qmldatainput/qml/qmldatainput/main.qml
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2019-06-28 10:46:43 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2019-06-28 10:46:54 +0300
commit0c4183e5748576845d9ce2aa61f56cf5c69c6350 (patch)
treedcf76e4de1dccb9646fbd35c6b9a5a1ea2009922 /examples/studio3d/qmldatainput/qml/qmldatainput/main.qml
parent427bf6fac383f066a1378679a88546b16f156c7e (diff)
parent1fee43d7b31f71f1f0c9d4498fbc52a11f7338f5 (diff)
Merge branch '2.4'
Diffstat (limited to 'examples/studio3d/qmldatainput/qml/qmldatainput/main.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 8267b01..32963ab 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"