diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-03-17 12:20:22 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-20 14:38:49 +0000 |
| commit | 3b4a0ba314706a59c34e21eb4085e3b5a1ee6a8d (patch) | |
| tree | 613032008fa35dcac2b80493c0fe0ef5514d3854 /src/render/framegraph/qrendersurfaceselector.h | |
| parent | 30b640ec6f8d1392505d3d3a94e3c71ddc70029f (diff) | |
QRenderSurfaceSelector cleanup
Change-Id: Ic38c88d5e940f04667278015dc4f6c45f162e936
Task-number: QTBUG-51508
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/framegraph/qrendersurfaceselector.h')
| -rw-r--r-- | src/render/framegraph/qrendersurfaceselector.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/render/framegraph/qrendersurfaceselector.h b/src/render/framegraph/qrendersurfaceselector.h index 83d10d180..954b8f37f 100644 --- a/src/render/framegraph/qrendersurfaceselector.h +++ b/src/render/framegraph/qrendersurfaceselector.h @@ -56,26 +56,22 @@ class QRenderSurfaceSelectorPrivate; class QT3DRENDERSHARED_EXPORT QRenderSurfaceSelector : public Qt3DRender::QFrameGraphNode { Q_OBJECT - Q_PROPERTY(QSurface *surface READ surface WRITE setSurface NOTIFY surfaceChanged) - Q_PROPERTY(QWindow *window READ window WRITE setWindow NOTIFY windowChanged) + Q_PROPERTY(QObject *surface READ surface WRITE setSurface NOTIFY surfaceChanged) Q_PROPERTY(QSize externalRenderTargetSize READ externalRenderTargetSize NOTIFY externalRenderTargetSizeChanged) public: explicit QRenderSurfaceSelector(Qt3DCore::QNode *parent = nullptr); ~QRenderSurfaceSelector(); - QSurface *surface() const; - QWindow *window() const; + QObject *surface() const; QSize externalRenderTargetSize() const; void setExternalRenderTargetSize(const QSize &size); public Q_SLOTS: - void setSurface(QSurface *surface); - void setWindow(QWindow *window); + void setSurface(QObject *surface); Q_SIGNALS: - void surfaceChanged(QSurface *surface); - void windowChanged(QWindow *window); + void surfaceChanged(QObject *surface); void externalRenderTargetSizeChanged(const QSize &size); protected: |