diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-21 23:59:03 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-22 01:53:29 +0100 |
| commit | bf58c70546c5f9cb66d99b82abfde9ba1a056192 (patch) | |
| tree | df3675d3377ef6576f82fb167ebd67fcc900a91b /src/opengl | |
| parent | 37f617c405ae4f26cbb6bb4f08d61d6ccc111a98 (diff) | |
| parent | 41cba737a98b16a2767c55cda0532f38b6b6a37d (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/corelib/io/qdir.cpp
src/corelib/kernel/qtimer.cpp
src/corelib/kernel/qtimer.h
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: I683d897760ec06593136d77955f8bc87fdef3f9f
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 666cc19bbe..1909e7492f 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -5202,25 +5202,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) |