summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-06-25 14:31:00 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-06-25 14:31:00 (GMT)
commit3e36b311710009039e8ffdfa46702e012f25785b (patch)
treee02a30a76a9e036bdc4fe85f35ba946d1a7d5389 /tests/auto
parent9d8f5dcb46f64ee2f5e205100b603f6d01f1381b (diff)
parent4b9784fcdd7321a5d82b8ae73edd1ae52786d7ad (diff)
downloadQt-3e36b311710009039e8ffdfa46702e012f25785b.zip
Qt-3e36b311710009039e8ffdfa46702e012f25785b.tar.gz
Qt-3e36b311710009039e8ffdfa46702e012f25785b.tar.bz2
Merge branch '4.5'
Conflicts: src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qsharedpointer/tst_qsharedpointer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
index 795ce76..a11164f 100644
--- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-
+#define QT_SHAREDPOINTER_TRACK_POINTERS
#include "qsharedpointer.h"
#include "externaltests.h"
#include <QtTest/QtTest>
@@ -995,6 +995,7 @@ void tst_QSharedPointer::invalidConstructs()
test.setDebugMode(true);
test.setQtModules(QTest::QExternalTest::QtCore);
test.setProgramHeader(
+ "#define QT_SHAREDPOINTER_TRACK_POINTERS\n"
"#include <QtCore/qsharedpointer.h>\n"
"\n"
"struct Data { int i; };\n"