diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-30 17:04:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-30 17:04:28 (GMT) |
| commit | f9d30be978f5f7f0ebf0b240064268037f01ebd5 (patch) | |
| tree | b625b04cbf52e4e5b4b69c153ec1c541ab89de1f /src/opengl/qgl.cpp | |
| parent | 349b6c734aa7af85f3709312325c3b2e9abdad2b (diff) | |
| parent | 3bee0c34590e6696d4477835aaa883e930903109 (diff) | |
| download | Qt-f9d30be978f5f7f0ebf0b240064268037f01ebd5.zip Qt-f9d30be978f5f7f0ebf0b240064268037f01ebd5.tar.gz Qt-f9d30be978f5f7f0ebf0b240064268037f01ebd5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
32bit => 16bit conversion has 4byte-aligned output.
Fix gcc bug in qReallocAligned
Prevented threading related crash in OpenGL module.
Fix possible crash in QStaticText and QDeclarativeTextLayout
Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index dbd295f..84cfa97 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -127,7 +127,12 @@ Q_GLOBAL_STATIC(QGLDefaultOverlayFormat, defaultOverlayFormatInstance) Q_GLOBAL_STATIC(QGLSignalProxy, theSignalProxy) QGLSignalProxy *QGLSignalProxy::instance() { - return theSignalProxy(); + QGLSignalProxy *proxy = theSignalProxy(); + if (proxy && proxy->thread() != qApp->thread()) { + if (proxy->thread() == QThread::currentThread()) + proxy->moveToThread(qApp->thread()); + } + return proxy; } |