diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-23 13:48:07 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-23 13:48:29 +0200 |
commit | 51763b1b191c0839ea05c75855b9e09b65b80546 (patch) | |
tree | 113c4b4328ddecd07c8cff2ac19cea6f2aec0ba2 /src/quick | |
parent | 2b7b24a0e039a18db8ab23475fbab44718f758a2 (diff) | |
parent | 363189a3d351ace484180ede0f2f6c4ed04f8401 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
Change-Id: I31375151eb239f348bec988d2d0506c2b4d9604c
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/scenegraph/qsgthreadedrenderloop.cpp | 1 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgatlastexture.cpp | 7 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgatlastexture_p.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp index 1e5e61e43b..fb04de27d7 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp +++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp @@ -553,6 +553,7 @@ void QSGRenderThread::sync(bool inExpose) if (d->renderer) d->renderer->clearChangedFlag(); d->syncSceneGraph(); + sgrc->endSync(); if (!hadRenderer && d->renderer) { qCDebug(QSG_LOG_RENDERLOOP) << QSG_RT_PAD << "- renderer was created"; syncResultedInChanges = true; diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp index d5f836a525..22f0b13f46 100644 --- a/src/quick/scenegraph/util/qsgatlastexture.cpp +++ b/src/quick/scenegraph/util/qsgatlastexture.cpp @@ -116,7 +116,7 @@ QSGTexture *Manager::create(const QImage &image, bool hasAlphaChannel) Texture *t = 0; if (image.width() < m_atlas_size_limit && image.height() < m_atlas_size_limit) { if (!m_atlas) - m_atlas = new Atlas(m_atlas_size, this); + m_atlas = new Atlas(m_atlas_size); // t may be null for atlas allocation failure t = m_atlas->create(image); if (t && !hasAlphaChannel && t->hasAlphaChannel()) @@ -125,9 +125,8 @@ QSGTexture *Manager::create(const QImage &image, bool hasAlphaChannel) return t; } -Atlas::Atlas(const QSize &size, QObject *parent) - : QObject(parent) - , m_allocator(size) +Atlas::Atlas(const QSize &size) + : m_allocator(size) , m_texture_id(0) , m_size(size) , m_atlas_transient_image_threshold(0) diff --git a/src/quick/scenegraph/util/qsgatlastexture_p.h b/src/quick/scenegraph/util/qsgatlastexture_p.h index 0bb07e8e89..3dee539547 100644 --- a/src/quick/scenegraph/util/qsgatlastexture_p.h +++ b/src/quick/scenegraph/util/qsgatlastexture_p.h @@ -88,7 +88,7 @@ private: class Atlas : public QObject { public: - Atlas(const QSize &size, QObject *parent); + Atlas(const QSize &size); ~Atlas(); void invalidate(); |