diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-04-06 09:57:43 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-04-06 08:59:07 +0000 |
commit | 58c23ae1619fb4afaae9c8eb2527c0906baef97b (patch) | |
tree | b55f783d1bc84bb4e31ccce639a9d02f282f5f7b | |
parent | 7bd08f4bfd31dfc1e2b9d9c5fff5cc4c79c03041 (diff) |
Windows QPA: Check QWindowsStaticOpenGLContext in nativeResourceForIntegration().
The instance of QWindowsStaticOpenGLContext has been observed to be 0.
Task-number: QTBUG-52387
Change-Id: I1ca97c6df0d96e732ae62354e03f465cd461bcb4
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
-rw-r--r-- | src/plugins/platforms/windows/qwindowsnativeinterface.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsnativeinterface.cpp b/src/plugins/platforms/windows/qwindowsnativeinterface.cpp index 659ef79c18..add6d6b1f0 100644 --- a/src/plugins/platforms/windows/qwindowsnativeinterface.cpp +++ b/src/plugins/platforms/windows/qwindowsnativeinterface.cpp @@ -138,8 +138,10 @@ void *QWindowsNativeInterface::nativeResourceForIntegration(const QByteArray &re #ifdef QT_NO_OPENGL Q_UNUSED(resource) #else - if (resourceType(resource) == GlHandleType) - return QWindowsIntegration::staticOpenGLContext()->moduleHandle(); + if (resourceType(resource) == GlHandleType) { + if (const QWindowsStaticOpenGLContext *sc = QWindowsIntegration::staticOpenGLContext()) + return sc->moduleHandle(); + } #endif return 0; |