1 files changed, 6 insertions, 57 deletions
diff --git a/tests/manual/diaglib/glinfo.cpp b/tests/manual/diaglib/glinfo.cpp
index d8aec5298a..1abd4dd731 100644
--- a/tests/manual/diaglib/glinfo.cpp
+++ b/tests/manual/diaglib/glinfo.cpp
@@ -1,53 +1,20 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "glinfo.h"
 
 #include <QOpenGLFunctions>
 #include <QtOpenGLWidgets/QOpenGLWidget>
-#if QT_VERSION > 0x050000
-#  if QT_VERSION >= 0x050400
-#    include <QtOpenGL/QOpenGLWindow>
-#  else // 5.4
-#    include <QtGui/QWindow>
-#  endif // 5.0..5.4
-#  include <QtGui/QOpenGLContext>
-#  include <QtGui/QOpenGLFunctions>
-#  include <QtGui/QWindow>
-#endif
+#include <QtOpenGL/QOpenGLWindow>
+#include <QtGui/QOpenGLContext>
+#include <QtGui/QOpenGLFunctions>
+#include <QtGui/QWindow>
 #include <QtCore/QDebug>
 #include <QtCore/QString>
 #include <QtCore/QTimer>
 
 namespace QtDiag {
 
-#if QT_VERSION > 0x050000
-
 static QString getGlString(const QOpenGLContext *ctx, GLenum name)
 {
     if (const GLubyte *p = ctx->functions()->glGetString(name))
@@ -64,7 +31,6 @@ static QString glInfo(const QOpenGLContext *ctx)
 
 QString glInfo(const QObject *o)
 {
-#  if QT_VERSION >= 0x050400
     if (o->isWindowType()) {
         if (const QOpenGLWindow *oglw = qobject_cast<const QOpenGLWindow *>(o))
             return glInfo(oglw->context());
@@ -74,25 +40,8 @@ QString glInfo(const QObject *o)
     if (o->isWidgetType()) {
         if (const QOpenGLWidget *g = qobject_cast<const QOpenGLWidget *>(o))
             return glInfo(g->context());
-#  endif // 5.4
     }
     return QString();
 }
 
-#else // Qt4:
-
-static QString getGlString(GLenum name)
-{
-    if (const GLubyte *p = glGetString(name))
-        return QString::fromLatin1(reinterpret_cast<const char *>(p));
-    return QString();
-}
-
-QString glInfo(const QObject *)
-{
-    return getGlString(GL_VENDOR) + QLatin1Char('\n') + getGlString(GL_RENDERER);
-}
-
-#endif
-
 } // namespace QtDiag