summaryrefslogtreecommitdiffstats
path: root/src/Runtime/ogl-runtime/src/api/studio3d/q3dssurfaceviewer.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/Runtime/ogl-runtime/src/api/studio3d/q3dssurfaceviewer.h')
-rw-r--r--src/Runtime/ogl-runtime/src/api/studio3d/q3dssurfaceviewer.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Runtime/ogl-runtime/src/api/studio3d/q3dssurfaceviewer.h b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssurfaceviewer.h
index 5c166af9..42be5c2c 100644
--- a/src/Runtime/ogl-runtime/src/api/studio3d/q3dssurfaceviewer.h
+++ b/src/Runtime/ogl-runtime/src/api/studio3d/q3dssurfaceviewer.h
@@ -51,8 +51,7 @@ class Q_STUDIO3D_EXPORT Q3DSSurfaceViewer : public QObject
Q_OBJECT
Q_DECLARE_PRIVATE(Q3DSSurfaceViewer)
- // #TODO: QT3DS-3532 SurfaceViewer API missing error string
- //Q_PROPERTY(QString error READ error NOTIFY errorChanged)
+ Q_PROPERTY(QString error READ error NOTIFY errorChanged)
Q_PROPERTY(bool running READ isRunning NOTIFY runningChanged)
Q_PROPERTY(QSize size READ size WRITE setSize NOTIFY sizeChanged)
Q_PROPERTY(bool autoSize READ autoSize WRITE setAutoSize NOTIFY autoSizeChanged)
@@ -91,6 +90,8 @@ public:
void setQmlEngine(QQmlEngine *qmlEngine);
QString presentationId() const;
+ QString error() const;
+
public Q_SLOTS:
void update();
void setPresentationId(const QString &id);
@@ -99,6 +100,7 @@ Q_SIGNALS:
void presentationLoaded();
void presentationReady();
void frameUpdate();
+ void errorChanged();
void presentationIdChanged(const QString &id);
void sizeChanged(const QSize &size);