summaryrefslogtreecommitdiffstats
path: root/src/Runtime/Source/viewer
diff options
context:
space:
mode:
Diffstat (limited to 'src/Runtime/Source/viewer')
-rw-r--r--src/Runtime/Source/viewer/Qt3DSViewerApp.cpp4
-rw-r--r--src/Runtime/Source/viewer/Qt3DSViewerApp.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Runtime/Source/viewer/Qt3DSViewerApp.cpp b/src/Runtime/Source/viewer/Qt3DSViewerApp.cpp
index 4dd5dbd9..8bf7eb80 100644
--- a/src/Runtime/Source/viewer/Qt3DSViewerApp.cpp
+++ b/src/Runtime/Source/viewer/Qt3DSViewerApp.cpp
@@ -754,12 +754,12 @@ void Q3DSViewerApp::SetGlobalAnimationTime(qint64 inMilliSecs)
}
void Q3DSViewerApp::SetDataInputValue(
- const QString &name, const QVariant &value, Q3DSDataInput::ValueRole valueRole)
+ const QString &name, const QVariant &value, qt3ds::runtime::DataInputValueRole valueRole)
{
if (!m_Impl.m_view)
return;
- m_Impl.m_view->SetDataInputValue(name, value, valueRole);
+ m_Impl.m_view->SetDataInputValue(name, value, int(valueRole));
}
void Q3DSViewerApp::setPresentationId(const QString &id)
diff --git a/src/Runtime/Source/viewer/Qt3DSViewerApp.h b/src/Runtime/Source/viewer/Qt3DSViewerApp.h
index 66a40e76..d2d9b93e 100644
--- a/src/Runtime/Source/viewer/Qt3DSViewerApp.h
+++ b/src/Runtime/Source/viewer/Qt3DSViewerApp.h
@@ -37,9 +37,8 @@
#include <vector>
#include <QObject>
#include <QtCore/qelapsedtimer.h>
-
+#include "Qt3DSApplication.h"
#include "Qt3DSInputDefs.h"
-#include "q3dsdatainput.h"
#include <QtGui/qsurfaceformat.h>
namespace Q3DStudio {
@@ -352,7 +351,8 @@ public:
void SetGlobalAnimationTime(qint64 inMilliSecs);
void SetDataInputValue(const QString &name, const QVariant &value,
- Q3DSDataInput::ValueRole valueRole = Q3DSDataInput::ValueRole::Value);
+ qt3ds::runtime::DataInputValueRole valueRole
+ = qt3ds::runtime::DataInputValueRole::Value);
QList<QString> dataInputs() const;