summaryrefslogtreecommitdiffstats
path: root/src/Runtime/Source/engine/Qt3DSRuntimeView.cpp
diff options
context:
space:
mode:
authorJanne Kangas <janne.kangas@qt.io>2019-03-21 13:38:12 +0200
committerJanne Kangas <janne.kangas@qt.io>2019-05-09 04:15:14 +0000
commit9859c764ea019fbe0e78a563c556afdc6cde7666 (patch)
treee876a8e804848d198d0fa339a0863de53c9d1ca2 /src/Runtime/Source/engine/Qt3DSRuntimeView.cpp
parentf699744899fa6d149b21ab4412a2588854ae8dbc (diff)
Remove circular build dependencywip/qtify
Duplicate enum defined in studio3d module on runtime side to avoid including the entire class from studio3d. Task-id: QT3DS-3396 Change-Id: I193b34614a8bbf991f717f8302061298b56e451e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Runtime/Source/engine/Qt3DSRuntimeView.cpp')
-rw-r--r--src/Runtime/Source/engine/Qt3DSRuntimeView.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Runtime/Source/engine/Qt3DSRuntimeView.cpp b/src/Runtime/Source/engine/Qt3DSRuntimeView.cpp
index 9863031d..5e6506b3 100644
--- a/src/Runtime/Source/engine/Qt3DSRuntimeView.cpp
+++ b/src/Runtime/Source/engine/Qt3DSRuntimeView.cpp
@@ -204,7 +204,7 @@ public:
void GoToTime(const char *elementPath, const float time) override;
void SetGlobalAnimationTime(qint64 inMilliSecs) override;
void SetDataInputValue(const QString &name, const QVariant &value,
- Q3DSDataInput::ValueRole property) override;
+ int property) override;
void setPresentationId(const QString &id) override
{
@@ -582,12 +582,12 @@ void CRuntimeView::SetGlobalAnimationTime(qint64 inMilliSecs)
void CRuntimeView::SetDataInputValue(
const QString &name, const QVariant &value,
- Q3DSDataInput::ValueRole property = Q3DSDataInput::ValueRole::Value)
+ int property = 0)
{
if (m_Application) {
Q3DStudio::CQmlEngine &theBridgeEngine
= static_cast<Q3DStudio::CQmlEngine &>(m_RuntimeFactoryCore->GetScriptEngineQml());
- theBridgeEngine.SetDataInputValue(name, value, property);
+ theBridgeEngine.SetDataInputValue(name, value, (qt3ds::runtime::DataInputValueRole)property);
}
}