summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-08-03 11:18:36 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-08-03 11:19:26 (GMT)
commit463df7e4a6dc7c11716e27ca5de9ebeb61940990 (patch)
treee466633f7722fa0fe67f64725078d3ec901f388a
parent4e693c01a62701f9376316a21b3d133a05dcc1e6 (diff)
downloadQt-463df7e4a6dc7c11716e27ca5de9ebeb61940990.zip
Qt-463df7e4a6dc7c11716e27ca5de9ebeb61940990.tar.gz
Qt-463df7e4a6dc7c11716e27ca5de9ebeb61940990.tar.bz2
Autotest: disable the pointer-tracking tests in 4.5
The functionality these tests tested was broken in 4.5 and has been disabled. Therefore, these tests simply cannot pass. It's fixed in 4.6.
-rw-r--r--tests/auto/qsharedpointer/tst_qsharedpointer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
index a11164f..697473e 100644
--- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
@@ -952,6 +952,7 @@ void tst_QSharedPointer::invalidConstructs_data()
"QSharedPointer<Data> b;\n"
"if (a + b) return;";
+#if QT_VERSION >= 0x040600
// two objects with the same pointer
QTest::newRow("same-pointer")
<< &QTest::QExternalTest::tryRunFail
@@ -965,6 +966,7 @@ void tst_QSharedPointer::invalidConstructs_data()
<< "Data *aData = new Data;\n"
"QSharedPointer<Data> ptr1 = QSharedPointer<Data>(aData);"
"ptr1 = QSharedPointer<Data>(aData);";
+#endif
// any type of cast for unrelated types:
// (we have no reinterpret_cast)