diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-10-04 12:15:49 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-20 09:04:19 +0200 |
commit | e0521a579e967d670a5f6d7d4a4cd90a6aa56e17 (patch) | |
tree | 3433f69880a3f8cf250c7ce6811e583446bbde4f /src/quick/items/qquickwindowmanager.cpp | |
parent | eafb8c29d37946e263d07067a173861087bd17a9 (diff) |
Change Q_ASSERTs in qquick[threaded]windowmanager.cpp to qWarning().
As they also triggers when a non-existing file is loaded into QML2
or windows have invalid sizes.
Change-Id: Iab1ce6c99f2bc2cb360ddaccce539cb97979ad5a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
Diffstat (limited to 'src/quick/items/qquickwindowmanager.cpp')
-rw-r--r-- | src/quick/items/qquickwindowmanager.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/quick/items/qquickwindowmanager.cpp b/src/quick/items/qquickwindowmanager.cpp index dd27182ffe..50887e8e99 100644 --- a/src/quick/items/qquickwindowmanager.cpp +++ b/src/quick/items/qquickwindowmanager.cpp @@ -225,7 +225,13 @@ void QQuickTrivialWindowManager::renderWindow(QQuickWindow *window) if (!masterWindow) return; - Q_ASSERT(QQuickWindowPrivate::get(masterWindow)->isRenderable()); + if (!QQuickWindowPrivate::get(masterWindow)->isRenderable()) { + qWarning().nospace() + << "Unable to find a renderable master window " + << masterWindow << "when trying to render" + << window << " (" << window->geometry() << ")."; + return; + } if (!gl) { gl = new QOpenGLContext(); |