diff options
Diffstat (limited to 'src/datavisualization/utils/qutils.h')
| -rw-r--r-- | src/datavisualization/utils/qutils.h | 40 |
1 files changed, 6 insertions, 34 deletions
diff --git a/src/datavisualization/utils/qutils.h b/src/datavisualization/utils/qutils.h index b7001652..6b58a977 100644 --- a/src/datavisualization/utils/qutils.h +++ b/src/datavisualization/utils/qutils.h @@ -1,31 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Data Visualization module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** 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 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** 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 #ifndef QUTILS_H #define QUTILS_H @@ -36,11 +10,9 @@ #include <QtGui/QOffscreenSurface> #include <QtCore/QCoreApplication> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE -#ifndef Q_QDOC -static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias = true) Q_DECL_UNUSED; -#endif +[[maybe_unused]] static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias) { bool isES = false; @@ -65,7 +37,7 @@ static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias) ctx->makeCurrent(dummySurface); } -#if defined(QT_OPENGL_ES_2) +#if QT_CONFIG(opengles2) isES = true; #elif (QT_VERSION < QT_VERSION_CHECK(5, 3, 0)) isES = false; @@ -111,6 +83,6 @@ static inline QSurfaceFormat qDefaultSurfaceFormat(bool antialias) return surfaceFormat; } -} +QT_END_NAMESPACE #endif |