diff options
Diffstat (limited to 'tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp')
| -rw-r--r-- | tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp b/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp index a641a3adba..423f9419da 100644 --- a/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp +++ b/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** 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) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtGui/QOpenGLFunctions> #include <QtGui/QScreen> @@ -34,7 +9,7 @@ #include <qpa/qplatformnativeinterface.h> #include <private/qopengl_p.h> -#include <QtTest/QtTest> +#include <QTest> #include <QtCore/QSysInfo> #include <QtCore/QLibraryInfo> @@ -154,7 +129,7 @@ static void dumpConfiguration(QTextStream &str) // On Windows, this will provide addition GPU info similar to the output of dxdiag. if (QGuiApplication::platformNativeInterface()) { const QVariant gpuInfoV = QGuiApplication::platformNativeInterface()->property("gpu"); - if (gpuInfoV.type() == QVariant::Map) { + if (gpuInfoV.userType() == QMetaType::QVariantMap) { const QString description = gpuInfoV.toMap().value(QStringLiteral("printable")).toString(); if (!description.isEmpty()) str << "\nGPU:\n" << description << "\n\n"; |