diff options
Diffstat (limited to 'tests/auto/corelib/text/qstringbuilder/qstringbuilder4')
3 files changed, 15 insertions, 37 deletions
diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt index b0dbcbf83a..94883b498a 100644 --- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt +++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/CMakeLists.txt @@ -1,9 +1,16 @@ -# Generated from qstringbuilder4.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qstringbuilder4 Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qstringbuilder4 LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qstringbuilder4 SOURCES tst_qstringbuilder4.cpp diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/qstringbuilder4.pro b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/qstringbuilder4.pro deleted file mode 100644 index e55848e4bd..0000000000 --- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/qstringbuilder4.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += testcase -TARGET = tst_qstringbuilder4 -QT = core testlib -SOURCES = tst_qstringbuilder4.cpp diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp index 2aecdcfff6..442c5275d2 100644 --- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp +++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.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 module 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 <QtCore/qglobal.h> @@ -43,7 +18,11 @@ #define LITERAL "some literal" -void runScenario(); // Defined in stringbuilder.cpp #included below. +namespace { +#define P + +#include "../qstringbuilder1/stringbuilder.cpp" +#undef P +} // namespace class tst_QStringBuilder4 : public QObject { @@ -53,10 +32,6 @@ private slots: void scenario() { runScenario(); } }; -#define P + -#include "../qstringbuilder1/stringbuilder.cpp" -#undef P - #include "tst_qstringbuilder4.moc" QTEST_APPLESS_MAIN(tst_QStringBuilder4) |