Commit e0521a57 authored by Friedemann Kleint's avatar Friedemann Kleint Committed by The Qt Project
Browse files

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: default avatarKai Koehne <kai.koehne@digia.com>
Reviewed-by: default avatarChristiaan Janssen <christiaan.janssen@digia.com>
parent eafb8c29
Branches
Tags
No related merge requests found
Showing with 22 additions and 11 deletions
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include "qquickthreadedwindowmanager_p.h" #include "qquickthreadedwindowmanager_p.h"
#include <QtCore/QTime> #include <QtCore/QTime>
#include <QtCore/QDebug>
#include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLContext>
#include <QtGui/private/qguiapplication_p.h> #include <QtGui/private/qguiapplication_p.h>
...@@ -396,20 +397,24 @@ void QQuickRenderThreadSingleContextWindowManager::run() ...@@ -396,20 +397,24 @@ void QQuickRenderThreadSingleContextWindowManager::run()
WindowData *windowData = it.value(); WindowData *windowData = it.value();
QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(window); QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(window);
Q_ASSERT(windowPrivate->isRenderable()); if (windowPrivate->isRenderable()) {
gl->makeCurrent(window);
gl->makeCurrent(window);
if (windowData->viewportSize != windowData->windowSize) { if (windowData->viewportSize != windowData->windowSize) {
#ifdef THREAD_DEBUG #ifdef THREAD_DEBUG
printf(" RenderThread: --- window has changed size...\n"); printf(" RenderThread: --- window has changed size...\n");
#endif #endif
windowData->viewportSize = windowData->windowSize; windowData->viewportSize = windowData->windowSize;
windowData->sizeWasChanged = true; windowData->sizeWasChanged = true;
glViewport(0, 0, windowData->viewportSize.width(), windowData->viewportSize.height()); glViewport(0, 0, windowData->viewportSize.width(), windowData->viewportSize.height());
} }
windowPrivate->syncSceneGraph(); windowPrivate->syncSceneGraph();
} else {
qWarning().nospace()
<< "Non-renderable window " << window
<< " (" << window->geometry() << ").";
}
} }
inSync = false; inSync = false;
......
...@@ -225,7 +225,13 @@ void QQuickTrivialWindowManager::renderWindow(QQuickWindow *window) ...@@ -225,7 +225,13 @@ void QQuickTrivialWindowManager::renderWindow(QQuickWindow *window)
if (!masterWindow) if (!masterWindow)
return; 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) { if (!gl) {
gl = new QOpenGLContext(); gl = new QOpenGLContext();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment