diff options
Diffstat (limited to 'tests/auto/corelib/text/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp')
| -rw-r--r-- | tests/auto/corelib/text/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp | 44 |
1 files changed, 12 insertions, 32 deletions
diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp index 397e3326bf..3222b52713 100644 --- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp +++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp @@ -1,46 +1,27 @@ -/**************************************************************************** -** -** 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> // SCENARIO 3 // this is the "no harm done" version. Only operator% is active, // with NO_CAST * _not_ defined -#define P % #undef QT_USE_QSTRINGBUILDER #undef QT_NO_CAST_FROM_ASCII #undef QT_NO_CAST_TO_ASCII - -#include <QtTest/QtTest> +#include <QtCore/QObject> +#include <QtCore/QString> +#include <QtCore/QStringBuilder> +#include <QtTest/QTest> #define LITERAL "some literal" -void runScenario(); // Defined in stringbuilder.cpp #included below. +namespace { +#define P % +#include "../qstringbuilder1/stringbuilder.cpp" +#undef P +} // namespace class tst_QStringBuilder3 : public QObject { @@ -50,7 +31,6 @@ private slots: void scenario() { runScenario(); } }; -#include "../qstringbuilder1/stringbuilder.cpp" #include "tst_qstringbuilder3.moc" QTEST_APPLESS_MAIN(tst_QStringBuilder3) |