diff options
author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2012-02-08 17:01:36 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-21 10:07:20 +0100 |
commit | 63f1fb2dfeabc01f14a1766a2277ece4d338b0e6 (patch) | |
tree | d8868c7bcebf660ef0f858eab8b7f20a266eb9bc /src/quick/items/qquickshadereffect_p.h | |
parent | 94052647d25f3da3903574a66051466d09eecf5e (diff) |
Free ShaderEffectSource FBOs when no longer needed.
This commit also fixes handling of texture provider deletion in
ShaderEffect.
Change-Id: Ib22a9308a35325972bc545cf29de11bd625b22b2
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/quick/items/qquickshadereffect_p.h')
-rw-r--r-- | src/quick/items/qquickshadereffect_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h index 4475c22b28..db1e4e78c1 100644 --- a/src/quick/items/qquickshadereffect_p.h +++ b/src/quick/items/qquickshadereffect_p.h @@ -133,6 +133,7 @@ private Q_SLOTS: void updateData(); void updateGeometry(); void updateLogAndStatus(const QString &log, int status); + void sourceDestroyed(QObject *object); private: friend class QQuickCustomMaterialShader; @@ -156,7 +157,7 @@ private: struct SourceData { QSignalMapper *mapper; - QPointer<QQuickItem> sourceObject; + QQuickItem *sourceObject; QByteArray name; }; QVector<SourceData> m_sources; |