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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgcontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp index d9ed25c099..53648e352a 100644 --- a/src/quick/scenegraph/qsgcontext.cpp +++ b/src/quick/scenegraph/qsgcontext.cpp @@ -393,7 +393,7 @@ QSGTexture *QSGRenderContext::textureForFactory(QQuickTextureFactory *factory, Q void QSGRenderContext::textureFactoryDestroyed(QObject *o) { m_mutex.lock(); - m_texturesToDelete << m_textures.take(static_cast<QQuickTextureFactory *>(o)); + m_texturesToDelete << m_textures.take(o); m_mutex.unlock(); } |