diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2014-12-20 06:36:17 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-12-20 07:59:07 +0100 |
| commit | 86d04cfe2bdceca401cab228bd63245f16e65731 (patch) | |
| tree | 4273b2f5879371d130cce0d6a97a7eb75175c980 /src/gui/kernel | |
| parent | 0dd38014b307f12368888c089195b084158f94a3 (diff) | |
| parent | e281537f2049af0b96fd87158f2b7212afe8ab5f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qopenglcontext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index 07a7c601fa..895ea1b07b 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/src/gui/kernel/qopenglcontext.cpp @@ -1114,9 +1114,9 @@ void QOpenGLContext::deleteQGLContext() void *QOpenGLContext::openGLModuleHandle() { #ifdef QT_OPENGL_DYNAMIC - QGuiApplication *app = qGuiApp; - Q_ASSERT(app); - return app->platformNativeInterface()->nativeResourceForIntegration(QByteArrayLiteral("glhandle")); + QPlatformNativeInterface *ni = QGuiApplication::platformNativeInterface(); + Q_ASSERT(ni); + return ni->nativeResourceForIntegration(QByteArrayLiteral("glhandle")); #else return 0; #endif |