diff options
author | Mikolaj Boc <mikolaj.boc@qt.io> | 2023-01-09 11:58:34 +0100 |
---|---|---|
committer | Mikolaj Boc <mikolaj.boc@qt.io> | 2023-01-10 20:09:35 +0100 |
commit | df030e06a81cf636aa766053af979ae79c2ab69d (patch) | |
tree | 6f659f93751e2205f8ca79d4e62d91b185865ef9 /tests/auto/corelib/text/qstringbuilder/qstringbuilder2 | |
parent | 042c7e58e2c6cdfeaddc38f7f5378247525a6b81 (diff) |
Adapt the qstringbuilder test for batching
There are numerous conflicting symbols in the tst_qstringbuilder\d
variants when batching those together. Remove the linkage from symbols
by putting the common include stringbuilder.cpp in an unnamed
namespace.
Task-number: QTBUG-109954
Change-Id: Ic2a745795b57482c90c9def7667a1145cdb19854
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/text/qstringbuilder/qstringbuilder2')
-rw-r--r-- | tests/auto/corelib/text/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp index 9a4de80c0f..f833c71c81 100644 --- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp +++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp @@ -18,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_QStringBuilder2 : public QObject { @@ -28,10 +32,6 @@ private slots: void scenario() { runScenario(); } }; -#define P + -#include "../qstringbuilder1/stringbuilder.cpp" -#undef P - #include "tst_qstringbuilder2.moc" QTEST_APPLESS_MAIN(tst_QStringBuilder2) |