diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-12 12:12:30 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-13 09:22:22 +0000 |
| commit | b943809c41cda9c01f26ba02ece4b6690b528d48 (patch) | |
| tree | 575f87d301c4300ed8d06da12f043e9d7749e129 /src/quick/items/qquickshadereffect_p.h | |
| parent | 3d2b9ef7ecd86db032942cbd68d6b9c610a03d9b (diff) | |
Add the skeleton for the new, more generic shader effect impl
which should route and place most of its work into the scenegraph.
And fix a test.
Change-Id: I04f29cba53c2bab62e41b3b524794d3c4d20a472
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'src/quick/items/qquickshadereffect_p.h')
| -rw-r--r-- | src/quick/items/qquickshadereffect_p.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/quick/items/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h index cabe657c3f..62d7e6fe5f 100644 --- a/src/quick/items/qquickshadereffect_p.h +++ b/src/quick/items/qquickshadereffect_p.h @@ -57,6 +57,7 @@ QT_BEGIN_NAMESPACE class QQuickOpenGLShaderEffect; +class QQuickGenericShaderEffect; class Q_QUICK_PRIVATE_EXPORT QQuickShaderEffect : public QQuickItem { @@ -109,6 +110,7 @@ public: Status status() const; bool isComponentComplete() const; + QString parseLog(); Q_SIGNALS: void fragmentShaderChanged(); @@ -127,14 +129,11 @@ protected: void componentComplete() override; void itemChange(ItemChange change, const ItemChangeData &value) override; -private Q_SLOTS: - void sourceDestroyed(QObject *object); - void propertyChanged(int mappedId); - private: #ifndef QT_NO_OPENGL QQuickOpenGLShaderEffect *m_glImpl; #endif + QQuickGenericShaderEffect *m_impl; }; QT_END_NAMESPACE |