diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-15 10:47:54 +0100 |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-15 10:47:54 +0100 |
commit | fcf91a2d527b393a366c997dd225c076afe34718 (patch) | |
tree | 0c8027b9f1059a5c63e777838fb4bf45b72293fc /tests/auto/qsharedpointer | |
parent | efa48b0a5dba8c8c93612e534d04b5b04629b75c (diff) | |
parent | 1a867a3c692e375565618532b8ca686dab7e7d5e (diff) |
Merge commit 'origin/4.6'
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/network/access/qnetworkrequest.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
Diffstat (limited to 'tests/auto/qsharedpointer')
-rw-r--r-- | tests/auto/qsharedpointer/tst_qsharedpointer.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp index ed9206cc28..0cb08f9d4e 100644 --- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp +++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp @@ -73,6 +73,7 @@ private slots: void forwardDeclaration2(); void memoryManagement(); void downCast(); + void functionCallDownCast(); void upCast(); void qobjectWeakManagement(); void noSharedPointerFromWeakQObject(); @@ -503,6 +504,15 @@ void tst_QSharedPointer::downCast() QCOMPARE(DerivedData::derivedDestructorCounter, destructorCount + 1); } +void functionDataByValue(QSharedPointer<Data> p) { Q_UNUSED(p); }; +void functionDataByRef(const QSharedPointer<Data> &p) { Q_UNUSED(p); }; +void tst_QSharedPointer::functionCallDownCast() +{ + QSharedPointer<DerivedData> p(new DerivedData()); + functionDataByValue(p); + functionDataByRef(p); +} + void tst_QSharedPointer::upCast() { QSharedPointer<Data> baseptr = QSharedPointer<Data>(new DerivedData); |