diff options
author | Liang Qi <liang.qi@qt.io> | 2018-11-19 12:42:10 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-11-19 12:42:10 +0100 |
commit | 4d180586cddbd71a67c83246db3bec1caa595e05 (patch) | |
tree | 0970def686b4e28e9cf6a3f0fc897e05bb0a9fbc /src/opengl | |
parent | 6b088b7a1da37511a8abb1503e4f2f95632dbdac (diff) | |
parent | 527406cbd99f44470ef87468b73c18df949e8ac7 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
Change-Id: I66a08c770767a93cd26535689e3e7806486aab06
Diffstat (limited to 'src/opengl')
-rw-r--r-- | src/opengl/qgl.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index e136ddcff2..a5556ccee3 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -5205,25 +5205,6 @@ void QGLWidgetPrivate::cleanupColormaps() { } -Q_GLOBAL_STATIC(QString, qt_gl_lib_name) - -void qt_set_gl_library_name(const QString& name) -{ - qt_gl_lib_name()->operator=(name); -} - -const QString qt_gl_library_name() -{ - if (qt_gl_lib_name()->isNull()) { -# if defined(QT_OPENGL_ES_2) - return QLatin1String("GLESv2"); -# else - return QLatin1String("GL"); -# endif - } - return *qt_gl_lib_name(); -} - void QGLContextGroup::addShare(const QGLContext *context, const QGLContext *share) { Q_ASSERT(context && share); if (context->d_ptr->group == share->d_ptr->group) |