diff options
| author | Marco Bubke <marco.bubke@digia.com> | 2014-02-19 14:54:24 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-25 13:56:41 +0100 |
| commit | b9f74e7467f31b63bd0ff2ae9d66bcd61a8b8b6f (patch) | |
| tree | d3b57da0e7582a734b30ab43f376dd7078606832 | |
| parent | 32cd6183c099d0948ec7c666d7a859a538773f7a (diff) | |
Fix wrong assert in QSGRenderLoop::setInstance
The assert before test not if the scoped pointer is null but the pointer
which was holding the scoping pointer.
Task-number: QTBUG-36932
Change-Id: I7a5e51752446556c1796bb677fe69cbceffdd3e0
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| -rw-r--r-- | src/quick/scenegraph/qsgrenderloop.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp index 08ab3809b3..499abab76b 100644 --- a/src/quick/scenegraph/qsgrenderloop.cpp +++ b/src/quick/scenegraph/qsgrenderloop.cpp @@ -204,7 +204,7 @@ QSGRenderLoop *QSGRenderLoop::instance() void QSGRenderLoop::setInstance(QSGRenderLoop *instance) { - Q_ASSERT(!s_renderLoopInstance); + Q_ASSERT(s_renderLoopInstance->isNull()); s_renderLoopInstance->reset(instance); } |