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>

1 files changed, 7 insertions, 3 deletions

diff --git a/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp b/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp
index 669990c9bc..ac4e383649 100644
--- a/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp
+++ b/tests/auto/corelib/text/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp
@@ -31,13 +31,14 @@
 // this is the "full" version. Operator+ is replaced by a QStringBuilder
 // based version
 // with NO_CAST * defined
-#define P +
 #define QT_USE_QSTRINGBUILDER
 #define QT_NO_CAST_FROM_ASCII
 #define 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_qstringbuilder2.moc"
 
 QTEST_APPLESS_MAIN(tst_QStringBuilder2)