summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2018-11-09 15:44:02 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2018-11-12 14:58:54 +0000
commit15b1c3fd9b82c8a29148c73be7aa4e8b2e07add1 (patch)
tree22d7ee17cba6b6110c06d7f5a5106be7ae254891 /src
parent0dae641331bbd21207f6c74a7a34e0c74103d61e (diff)
Purge some unused code for the OpenGL library name
We had a global static, a setter for it (that's nowhere used within Qt code) and a getter for it whose only use was commented out. Neither was declared in any header; the getter's commented-out client had a local extern declaration at the point of (non-)use. Found while reviewing a change to the next few lines of code after the commented-out use of the getter. Change-Id: I393d56219cb7dd7cf836ca80e1bdd605a2914003 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/opengl/qgl.cpp19
-rw-r--r--src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp2
2 files changed, 0 insertions, 21 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index d9f2113c14..78c2dfda7c 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -5195,25 +5195,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)
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
index 741885e321..93cd3e215f 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
@@ -648,8 +648,6 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName)
#endif
{
#if QT_CONFIG(library)
- extern const QString qt_gl_library_name();
-// QLibrary lib(qt_gl_library_name());
QLibrary lib(QLatin1String("GL"));
if (!lib.load())
lib.setFileNameAndVersion(QLatin1String("GL"), 1);