diff options
author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-06-12 14:36:18 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-06-12 12:08:42 +0000 |
commit | c39d3e96e6e8725207eda830b9b5660bd2783a3e (patch) | |
tree | 0fea7da8d9fa1a43834eae0874f9935c3a390d24 /src/Authoring/Studio/Application/DataInputDlg.h | |
parent | 29e1fcfba128b1af20a67a02148a34e163b2d5b9 (diff) |
Fix datainput type issuesv2.0.0-rc2v2.0.0
- When adding a new data input the type is set correctly even if you
don't touch the type combo.
- When adding a new data input from popup menu for property, timeline,
or slide panel, the corresponding data input is not changed if the
new data input is of unsuitable type.
- Correct default type is shown for each property when setting data
input from inspector panel.
Task-number: QT3DS-1913
Change-Id: I704cb704fb1ec9aca916ed7f7542ace404bba77c
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Application/DataInputDlg.h')
-rw-r--r-- | src/Authoring/Studio/Application/DataInputDlg.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Authoring/Studio/Application/DataInputDlg.h b/src/Authoring/Studio/Application/DataInputDlg.h index e38ee8b8..838fcd2e 100644 --- a/src/Authoring/Studio/Application/DataInputDlg.h +++ b/src/Authoring/Studio/Application/DataInputDlg.h @@ -69,6 +69,8 @@ public: // Maps between DataModel datatypes and datainput dialog types static const bool isEquivalentDataType(int dlgType, qt3dsdm::DataModelDataType::Value dmType); + static QVector<EDataType> getAcceptedTypes(qt3dsdm::DataModelDataType::Value dmType); + protected: void initDialog(); QString getUniqueId(const QString &id); |