summaryrefslogtreecommitdiffstats
path: root/examples/studio3d/qmldatainput/qml/qmldatainput/main.qml
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '2.4'Miikka Heikkinen2019-06-281-5/+5
|\ | | | | | | Change-Id: If71792b205f44b2cf9998ddfe03ce18a225285ca
| * Make datainput metadata keys constant Q_PROPERTYJanne Kangas2019-06-111-5/+5
| | | | | | | | | | | | | | | | | | | | 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>
* | Update qmldatainput exampleJari Karppinen2019-06-271-6/+6
|/ | | | | | | | | | | Editor shows mismatched data type warning for colorInput, since colors are Vector4 instead of Vector3 now. Suppress the warning by correcting the data input type in .uia file. Furthermore the QML code is updated to use Vector4 and PropertyAnimation instead of Vector3dAnimation to pass in the values from QML. Change-Id: I0e0370dab139a5ebea00404035774c99e3d8ea82 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Long live the slayer!Pasi Keränen2019-06-071-0/+211
Initial commit of OpenGL Runtime to repository. Based on SHA1 61823aaccc6510699a54b34a2fe3f7523dab3b4e of qt3dstudio repository. Task-number: QT3DS-3600 Change-Id: Iaeb80237399f0e5656a19ebec9d1ab3a681d8832 Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>