summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-07-25 10:05:28 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-07-26 11:42:25 (GMT)
commit295f0fd9b98a7e4846c7a8c8c92116fb05f7cbd7 (patch)
tree16a24b2ca444d911a807f02369133f38af46b546
parente4c3734d31dd4f76c96b0b8f7607347aeea328c3 (diff)
downloadQt-295f0fd9b98a7e4846c7a8c8c92116fb05f7cbd7.zip
Qt-295f0fd9b98a7e4846c7a8c8c92116fb05f7cbd7.tar.gz
Qt-295f0fd9b98a7e4846c7a8c8c92116fb05f7cbd7.tar.bz2
Fix a running external tests: user program headers must come first.
No wonder QT_SHAREDPOINTER_TRACK_POINTERS was having no effect: there was an #include <QtCore/QtCore> before it. (cherry picked from commit 4c12010fac555bce0a6c8d69a267a56f4c15087f)
-rw-r--r--tests/auto/qsharedpointer/externaltests.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qsharedpointer/externaltests.cpp b/tests/auto/qsharedpointer/externaltests.cpp
index 75ac5f1..d1618d1 100644
--- a/tests/auto/qsharedpointer/externaltests.cpp
+++ b/tests/auto/qsharedpointer/externaltests.cpp
@@ -323,6 +323,8 @@ namespace QTest {
sourceCode.clear();
sourceCode.reserve(8192);
+ sourceCode += programHeader;
+
// Add Qt header includes
if (qtModules & QExternalTest::QtCore)
sourceCode += "#include <QtCore/QtCore>\n";
@@ -356,8 +358,6 @@ namespace QTest {
"#include <stdlib.h>\n"
"#include <stddef.h>\n";
- sourceCode += programHeader;
-
sourceCode +=
"\n"
"void q_external_test_user_code()\n"