summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qgl.cpp2
-rw-r--r--src/opengl/qglcolormap.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 286deaf868..490b79664f 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -163,7 +163,7 @@ Q_GLOBAL_STATIC(QGLSignalProxy, theSignalProxy)
QGLSignalProxy *QGLSignalProxy::instance()
{
QGLSignalProxy *proxy = theSignalProxy();
- if (proxy && proxy->thread() != qApp->thread()) {
+ if (proxy && qApp && proxy->thread() != qApp->thread()) {
if (proxy->thread() == QThread::currentThread())
proxy->moveToThread(qApp->thread());
}
diff --git a/src/opengl/qglcolormap.cpp b/src/opengl/qglcolormap.cpp
index 12ce19026f..58a69c8d8e 100644
--- a/src/opengl/qglcolormap.cpp
+++ b/src/opengl/qglcolormap.cpp
@@ -37,7 +37,7 @@
a QGLWidget.
\obsolete
- \inmodule OpenGL
+ \inmodule QtOpenGL
\ingroup painting-3D
\ingroup shared