1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include <QTest>, not <QtTest>

Browse Source 
Avoid module-wide inclusions for QtTest. The transitive inclusions
eat a considerable amount of compilation time.

Task-number: QTQAINFRA-7110
Pick-to: 6.8
Change-Id: Ic1c93b40b638ea5bff739be212f173457bae26aa
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 5e1a1787322ce20752fc5f5251364e4e3d211dca)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Giuseppe D'Angelo 2025-04-10 13:56:30 +02:00 committed by Qt Cherry-pick Bot
parent 55ea4ebe34
commit cb84d80c8a
13 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/cmake/test_add_resources_big_resources/main.cpp
View File

@ -4,7 +4,7 @@
#include "intermediate_lib.h" #include "intermediate_lib.h"
#include <QtCore/qfile.h> #include <QtCore/qfile.h>
#include <QtTest/QtTest> #include <QtTest/QTest>
class TestAddResourcesBigResources : public QObject class TestAddResourcesBigResources : public QObject
{ {

2
tests/auto/cmake/test_resource_without_obj_lib/main.cpp
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtCore/qtresource.h> #include <QtCore/qtresource.h>
#include <QtTest/QtTest> #include <QtTest/QTest>
class TestManualResourceInit : public QObject class TestManualResourceInit : public QObject
{ {

2
tests/auto/cmake/test_static_resources/test_init_resources_static_plugin/test_init_resources_static_plugin.cpp
View File

@ -1,7 +1,7 @@
// Copyright (C) 2021 The Qt Company Ltd. // Copyright (C) 2021 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtTest/QtTest> #include <QtTest/QTest>
#include <QtCore/qfile.h> #include <QtCore/qfile.h>
#include <QtCore/qobject.h> #include <QtCore/qobject.h>
#include <QtCore/qpluginloader.h> #include <QtCore/qpluginloader.h>

2
tests/auto/cmake/test_static_resources/test_static_resources_propagation/main.cpp
View File

@ -1,7 +1,7 @@
// Copyright (C) 2021 The Qt Company Ltd. // Copyright (C) 2021 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtTest/QtTest> #include <QtTest/QTest>
#include <QtCore/qfile.h> #include <QtCore/qfile.h>
#include <QtCore/qobject.h> #include <QtCore/qobject.h>
#include <QtPlugin> #include <QtPlugin>

2
tests/auto/corelib/kernel/qjniarray/tst_qjniarray.cpp
View File

@ -1,7 +1,7 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2022 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtTest> #include <QTest>
#include <QtCore/qjnitypes.h> #include <QtCore/qjnitypes.h>
#include <QtCore/qjniarray.h> #include <QtCore/qjniarray.h>

2
tests/auto/corelib/kernel/qjnienvironment/tst_qjnienvironment.cpp
View File

@ -5,7 +5,7 @@
#include <QtCore/QJniEnvironment> #include <QtCore/QJniEnvironment>
#include <QtCore/QJniObject> #include <QtCore/QJniObject>
#include <QtTest/QtTest> #include <QtTest/QTest>
static const char javaTestClass[] = static const char javaTestClass[] =
"org/qtproject/qt/android/testdatapackage/QtJniEnvironmentTestClass"; "org/qtproject/qt/android/testdatapackage/QtJniEnvironmentTestClass";

2
tests/auto/corelib/kernel/qjniobject/tst_qjniobject.cpp
View File

@ -6,7 +6,7 @@
#include <QString> #include <QString>
#include <QtCore/QJniEnvironment> #include <QtCore/QJniEnvironment>
#include <QtCore/QJniObject> #include <QtCore/QJniObject>
#include <QtTest> #include <QTest>
using namespace Qt::StringLiterals; using namespace Qt::StringLiterals;

2
tests/auto/corelib/kernel/qjnitypes/tst_qjnitypes.cpp
View File

@ -1,7 +1,7 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2022 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtTest> #include <QTest>
#include <QtCore/qjnitypes.h> #include <QtCore/qjnitypes.h>
#include <QtCore/qjniarray.h> #include <QtCore/qjniarray.h>

2
tests/auto/corelib/platform/windows/qbstr/tst_qbstr.cpp
View File

@ -1,7 +1,7 @@
// Copyright (C) 2016 The Qt Company Ltd. // Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtTest/QtTest> #include <QtTest/QTest>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN

2
tests/auto/corelib/tools/qduplicatetracker/tst_qduplicatetracker.cpp
View File

@ -1,7 +1,7 @@
// Copyright (C) 2020 The Qt Company Ltd. // Copyright (C) 2020 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtTest/QtTest> #include <QtTest/QTest>
#include <QtCore/private/qduplicatetracker_p.h> #include <QtCore/private/qduplicatetracker_p.h>

2
tests/auto/tools/windeployqt/tst_windeployqt.cpp
View File

@ -10,7 +10,7 @@
#include <QtCore/QProcessEnvironment> #include <QtCore/QProcessEnvironment>
#include <QtCore/QStandardPaths> #include <QtCore/QStandardPaths>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
#include <QtTest/QtTest> #include <QtTest/QTest>
static const QString msgProcessError(const QProcess &process, const QString &what, static const QString msgProcessError(const QProcess &process, const QString &what,
const QByteArray &stdOut = QByteArray(), const QByteArray &stdOut = QByteArray(),

2
tests/manual/ios_assets/main.cpp
View File

@ -3,7 +3,7 @@
#include <QtCore/QStandardPaths> #include <QtCore/QStandardPaths>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtTest/QtTest> #include <QtTest/QTest>
#ifdef DEBUG_APP_DATA_LOCATION #ifdef DEBUG_APP_DATA_LOCATION
#include <QtCore/QDebug> #include <QtCore/QDebug>

2
tests/manual/qscreen_xrandr/tst_qscreen_xrandr.cpp
View File

@ -7,7 +7,7 @@
#include <qpa/qwindowsysteminterface.h> #include <qpa/qwindowsysteminterface.h>
#include <QProcess> #include <QProcess>
#include <QtTest/QtTest> #include <QtTest/QTest>
class tst_QScreen_Xrandr: public QObject class tst_QScreen_Xrandr: public QObject
{ {