diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-06-02 14:32:26 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-02 20:07:25 +0200 |
| commit | b41cb926b87db3b437fa833d1ca266b9adf3ac0e (patch) | |
| tree | 0318f55954157a032150622e60249977c800af51 /src/quick3d/quick3drenderer/items/quick3dviewport.h | |
| parent | 01f6000a247dbaa87f7191d89088deed3804f4e7 (diff) | |
Viewport converted to qmlRegisterExtendedType
Change-Id: I94fddf5aee7460686e20fd47f5ddb6a89a0e9fb5
Note: Still no rendering
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drenderer/items/quick3dviewport.h')
| -rw-r--r-- | src/quick3d/quick3drenderer/items/quick3dviewport.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/quick3d/quick3drenderer/items/quick3dviewport.h b/src/quick3d/quick3drenderer/items/quick3dviewport.h index 0e488afa8..738ca4b5e 100644 --- a/src/quick3d/quick3drenderer/items/quick3dviewport.h +++ b/src/quick3d/quick3drenderer/items/quick3dviewport.h @@ -42,6 +42,7 @@ #ifndef QT3D_RENDER_QUICK_QUICK3DVIEWPORT_H #define QT3D_RENDER_QUICK_QUICK3DVIEWPORT_H +#include <Qt3DQuick/quick3dnode.h> #include <Qt3DQuickRenderer/quick3dframegraphitem.h> #include <Qt3DRenderer/viewport.h> @@ -53,17 +54,13 @@ namespace Render { namespace Quick { -class QT3DQUICKRENDERERSHARED_EXPORT Quick3DViewport : public Quick3DFrameGraphItem, public virtual Viewport +// TO DO : Check if this is required or if this might as well be removed + +class QT3DQUICKRENDERERSHARED_EXPORT Quick3DViewport : public Qt3D::Quick::Quick3DNode { Q_OBJECT - Q_INTERFACES(Qt3D::Viewport) - Q_PROPERTY(QRectF rect READ rect WRITE setRect NOTIFY rectChanged) public: - explicit Quick3DViewport(Node *parent = 0); - -Q_SIGNALS: - void rectChanged() Q_DECL_OVERRIDE; - void enabledChanged() Q_DECL_OVERRIDE; + explicit Quick3DViewport(QObject *parent = 0); }; } // Quick |