summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/text/qstringbuilder/qstringbuilder4
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2020-06-04 02:24:19 +0200
committerGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2020-06-04 15:58:02 +0200
commit77a8005dcb12a274193c8009df03e84ff6b51582 (patch)
tree3fc84bc73aebf69d0324e3082d6b9daaf0a836bb /tests/auto/corelib/text/qstringbuilder/qstringbuilder4
parentc2085c26cf868d3dd0deb37cef525d95a0175256 (diff)
QStringBuilder: code tidies in the tests
Including other headers, while defining very questionable macro names, can and will result in trouble. Stop doing that. While at it, move from including <QtTest> to include-what-you-use, and clean up the code a bit. Change-Id: Idb02ef2b612c0805baecac3ce6edd435609aca4c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/corelib/text/qstringbuilder/qstringbuilder4')
-rw-r--r--tests/auto/corelib/text/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp
index 05ce334c82..4efc69908e 100644
--- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp
+++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp
@@ -31,13 +31,14 @@
// this is the "full" version. Operator+ is replaced by a QStringBuilder
// based version
// with NO_CAST * _not_ defined
-#define P +
#define 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"
@@ -51,7 +52,10 @@ private slots:
void scenario() { runScenario(); }
};
+#define P +
#include "../qstringbuilder1/stringbuilder.cpp"
+#undef P
+
#include "tst_qstringbuilder4.moc"
QTEST_APPLESS_MAIN(tst_QStringBuilder4)