diff options
Diffstat (limited to 'tests/manual/diaglib/logwidget.cpp')
| -rw-r--r-- | tests/manual/diaglib/logwidget.cpp | 41 |
1 files changed, 4 insertions, 37 deletions
diff --git a/tests/manual/diaglib/logwidget.cpp b/tests/manual/diaglib/logwidget.cpp index 0089664a60..e49a78d454 100644 --- a/tests/manual/diaglib/logwidget.cpp +++ b/tests/manual/diaglib/logwidget.cpp @@ -1,41 +1,14 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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 "logwidget.h" -#if QT_VERSION >= 0x050000 -# include <QtCore/qlogging.h> -# include <QtCore/QLibraryInfo> -#endif #include <QApplication> #include <QStyle> #include <QtCore/QDebug> +#include <QtCore/QLibraryInfo> #include <QtCore/QList> +#include <QtCore/qlogging.h> #include <QtCore/QStringList> #include <iostream> @@ -60,19 +33,13 @@ LogWidget::~LogWidget() QString LogWidget::startupMessage() { QString result; -#if QT_VERSION >= 0x050300 result += QLatin1String(QLibraryInfo::build()); -#else - result += QLatin1String("Qt ") + QLatin1String(QT_VERSION_STR); -#endif const QCoreApplication *coreApp = QCoreApplication::instance(); -#if QT_VERSION >= 0x050000 if (qobject_cast<const QGuiApplication *>(coreApp)) { result += QLatin1Char(' '); result += QGuiApplication::platformName(); } -#endif if (qobject_cast<const QApplication *>(coreApp)) { result += QLatin1Char(' '); result += QApplication::style()->objectName(); |