diff options
| author | Jesus Fernandez <jesus.fernandez@qt.io> | 2017-08-01 18:02:17 +0200 |
|---|---|---|
| committer | Jesus Fernandez <Jesus.Fernandez@qt.io> | 2017-08-03 12:01:12 +0000 |
| commit | 0fe0d6020ccb805f7b9ca138ce8d5eac11d884fe (patch) | |
| tree | 52037b9ae1c3f1722a8dca5a02f2546c35624868 | |
| parent | 164fbb1f630ee386e84f3c21dff942fce72cdebb (diff) | |
Allow Desktop OpenGL builds of Qt
Since OpenGL ES2 is just a subset of OpenGL and Qt Quick is not using
features from Desktop OpenGL it is safe to allow non-ES2 versions of Qt.
In case of a requested function is not available a message will be shown
and a null function is returned in getProcAddress function.
macOS cannot be allowed because it is not possible to access the
QCocoaEventDispactcher from another platform plugin.
Change-Id: I55c51c31e2b78978a6dcb6cc4d99ec7502392b40
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| -rw-r--r-- | qtwebglplugin.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/webgl/qwebglcontext.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/qtwebglplugin.pro b/qtwebglplugin.pro index 384a14a..c3e385d 100644 --- a/qtwebglplugin.pro +++ b/qtwebglplugin.pro @@ -1,3 +1,3 @@ -requires(!winrt:qtHaveModule(websockets):qtHaveModule(gui):qtConfig(opengles2)) +requires(!winrt:!macos:qtHaveModule(websockets):qtHaveModule(gui)) load(qt_parts) diff --git a/src/plugins/platforms/webgl/qwebglcontext.cpp b/src/plugins/platforms/webgl/qwebglcontext.cpp index afa5368..e3c25bf 100644 --- a/src/plugins/platforms/webgl/qwebglcontext.cpp +++ b/src/plugins/platforms/webgl/qwebglcontext.cpp @@ -2452,6 +2452,7 @@ QFunctionPointer QWebGLContext::getProcAddress(const char *procName) for (auto i = 0u; i < size; ++i) if (strcmp(procName, funcTab[i].name) == 0) return funcTab[i].func; + qCCritical(lc, "%s function not available", procName); return nullptr; } |