diff options
author | Janne Kangas <janne.kangas@qt.io> | 2019-03-21 13:38:12 +0200 |
---|---|---|
committer | Janne Kangas <janne.kangas@qt.io> | 2019-05-09 04:15:14 +0000 |
commit | 9859c764ea019fbe0e78a563c556afdc6cde7666 (patch) | |
tree | e876a8e804848d198d0fa339a0863de53c9d1ca2 /src/Runtime/Source/viewer | |
parent | f699744899fa6d149b21ab4412a2588854ae8dbc (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/viewer')
-rw-r--r-- | src/Runtime/Source/viewer/Qt3DSViewerApp.cpp | 4 | ||||
-rw-r--r-- | src/Runtime/Source/viewer/Qt3DSViewerApp.h | 6 |
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; |