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/engine/Qt3DSRuntimeView.h | |
| 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/engine/Qt3DSRuntimeView.h')
| -rw-r--r-- | src/Runtime/Source/engine/Qt3DSRuntimeView.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Runtime/Source/engine/Qt3DSRuntimeView.h b/src/Runtime/Source/engine/Qt3DSRuntimeView.h index 776fbea2..0bd63010 100644 --- a/src/Runtime/Source/engine/Qt3DSRuntimeView.h +++ b/src/Runtime/Source/engine/Qt3DSRuntimeView.h @@ -38,7 +38,7 @@ #include "render/Qt3DSRenderBaseTypes.h" #include "EASTL/string.h" #include "foundation/Qt3DSRefCounted.h" -#include "q3dsdatainput.h" +#include "Qt3DSApplication.h" #include "Qt3DSWindowSystem.h" #include "Qt3DSTimer.h" #include "Qt3DSPresentation.h" @@ -185,7 +185,7 @@ public: virtual void GoToTime(const char *elementPath, const float time) = 0; virtual void SetGlobalAnimationTime(qint64 inMilliSecs) = 0; virtual void SetDataInputValue(const QString &name, const QVariant &value, - Q3DSDataInput::ValueRole property) = 0; + int property) = 0; virtual QList<QString> dataInputs() const = 0; virtual float dataInputMax(const QString &name) const = 0; virtual float dataInputMin(const QString &name) const = 0; |