diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-04-11 02:43:28 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-04-11 07:55:21 (GMT) |
| commit | 78722d6b6e9ba0f6de1a4eba232aad2f96a339f2 (patch) | |
| tree | dbe8ba757338b7acbaffdfb76016b1aa18089830 /tests/auto/qsharedpointer/tst_qsharedpointer.cpp | |
| parent | f55d5a5a3c2842d4e5f66cc86219cea56f2a4612 (diff) | |
| download | Qt-78722d6b6e9ba0f6de1a4eba232aad2f96a339f2.zip Qt-78722d6b6e9ba0f6de1a4eba232aad2f96a339f2.tar.gz Qt-78722d6b6e9ba0f6de1a4eba232aad2f96a339f2.tar.bz2 | |
Remove autotest code related to old Qt versions
Reviewed-by: Rohan McGovern
Diffstat (limited to 'tests/auto/qsharedpointer/tst_qsharedpointer.cpp')
| -rw-r--r-- | tests/auto/qsharedpointer/tst_qsharedpointer.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp index e7c8175..bb04621 100644 --- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp +++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp @@ -698,7 +698,7 @@ void tst_QSharedPointer::noSharedPointerFromWeakQObject() QSharedPointer<QObject> strong = weak.toStrongRef(); QVERIFY(strong.isNull()); - // is something went wrong, we'll probably crash here + // if something went wrong, we'll probably crash here } void tst_QSharedPointer::weakQObjectFromSharedPointer() @@ -1747,7 +1747,6 @@ 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 @@ -1761,7 +1760,6 @@ 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) |