diff options
| author | Gunnar Sletta <gunnar@sletta.org> | 2014-10-01 11:12:18 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar@sletta.org> | 2014-10-01 12:19:14 +0200 |
| commit | 64e2fa80015fb7d9e53cc66357870d4ea11f3590 (patch) | |
| tree | 15a72f25a368c8eb8d4f94b4eadda6b83b33cce3 /src/quick/scenegraph/qsgadaptationlayer_p.h | |
| parent | 125c96476e98cb393d2cf133a8245cb0672109a1 (diff) | |
Partially revert d9c531781e6c95f80681b3c82700833e1de88794
This logic changed then timing for when the layer's m_dirtyTexture
was set and unset, which had some side effects. Revert to the old
and known-to-work behavior of using a connection.
Change-Id: I4048e7ae70491afe36b2d766e6c506d9febc44ed
Task-number: QTBUG-41451
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/quick/scenegraph/qsgadaptationlayer_p.h')
| -rw-r--r-- | src/quick/scenegraph/qsgadaptationlayer_p.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/quick/scenegraph/qsgadaptationlayer_p.h b/src/quick/scenegraph/qsgadaptationlayer_p.h index 71033bd6d0..a63299fcde 100644 --- a/src/quick/scenegraph/qsgadaptationlayer_p.h +++ b/src/quick/scenegraph/qsgadaptationlayer_p.h @@ -198,7 +198,6 @@ class Q_QUICK_EXPORT QSGLayer : public QSGDynamicTexture Q_OBJECT public: virtual void setItem(QSGNode *item) = 0; - virtual void setShaderSourceNode(QSGNode *node) = 0; virtual void setRect(const QRectF &rect) = 0; virtual void setSize(const QSize &size) = 0; virtual void scheduleUpdate() = 0; @@ -211,17 +210,9 @@ public: Q_SLOT virtual void markDirtyTexture() = 0; Q_SLOT virtual void invalidated() = 0; - Q_SLOT void markDirtyTextureLater(); - Q_SIGNALS: void updateRequested(); void scheduledUpdateCompleted(); - -protected: - virtual void customEvent(QEvent *); - -private: - int markDirtyEventType(); }; class Q_QUICK_PRIVATE_EXPORT QSGGlyphNode : public QSGVisitableNode |