summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Kangas <janne.kangas@qt.io>2018-10-16 11:28:58 +0300
committerJanne Kangas <janne.kangas@qt.io>2018-10-18 11:07:29 +0000
commit745c7eb9e734d9e9670b4c25c97f04749c83180a (patch)
tree2588bc8cb770f70628266f373ea434e35ae37807
parent510029c1d1974d3e0d417e87da30261357fec510 (diff)
Allow String and Variant datainput types as slide controllers everywhere
Fix allows setting Variant datainput as slide controller also in SlideView, in order to match datainput management dialog behavior. Change-Id: I6aacfdf08e8f068b871bccc5b3415cc0876ae92d Task-id: QT3DS-2511 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--src/Authoring/Studio/Palettes/Slide/SlideView.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.cpp b/src/Authoring/Studio/Palettes/Slide/SlideView.cpp
index 7346ed63..be3e36a3 100644
--- a/src/Authoring/Studio/Palettes/Slide/SlideView.cpp
+++ b/src/Authoring/Studio/Palettes/Slide/SlideView.cpp
@@ -119,7 +119,7 @@ void SlideView::showControllerDialog(const QPoint &point)
QVector<QPair<QString, int>> dataInputList;
for (auto it : qAsConst(g_StudioApp.m_dataInputDialogItems)) {
- if (it->type == EDataType::DataTypeString)
+ if (it->type == EDataType::DataTypeString || it->type == EDataType::DataTypeVariant)
dataInputList.append(QPair<QString, int>(it->name, it->type));
}
m_dataInputSelector->setData(dataInputList, currCtr);