diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-05-28 17:59:34 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-05-28 17:59:40 +0200 |
| commit | 1f3c157ec6b8be5de1eb89295713c2980fb1a7aa (patch) | |
| tree | b85888d73518f6abc7bbde74ab71a27887682f9d /src/quick/scenegraph/qsgcontext_p.h | |
| parent | 44ca7e31ee9365a72cd17ecd335ec4d0161420a9 (diff) | |
| parent | 0f5c34f2c6b64bae3429706a6c4211334c689092 (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into wip/scenegraphng"wip/scenegraphng
Diffstat (limited to 'src/quick/scenegraph/qsgcontext_p.h')
| -rw-r--r-- | src/quick/scenegraph/qsgcontext_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h index 6d70d7ef6b..282ce828af 100644 --- a/src/quick/scenegraph/qsgcontext_p.h +++ b/src/quick/scenegraph/qsgcontext_p.h @@ -194,7 +194,7 @@ protected: QPointer<QSGContext> m_sg; QMutex m_mutex; - QHash<QQuickTextureFactory *, QSGTexture *> m_textures; + QHash<QObject *, QSGTexture *> m_textures; QSet<QSGTexture *> m_texturesToDelete; QHash<QString, QSGDistanceFieldGlyphCache *> m_glyphCaches; |