diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-28 08:14:11 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-28 08:14:11 (GMT) |
| commit | 36bd47429312f6d78d620c04bb7e62d34273d310 (patch) | |
| tree | dea54adff0ec870a88d96e7e3bb00b9657175412 /tests/auto/declarative/qdeclarativeengine | |
| parent | 00ebbeb5c319957d5671130313da3c5485e0f31c (diff) | |
| parent | 2737386ebcb99715d3198a91b5951415c24f99aa (diff) | |
| download | Qt-36bd47429312f6d78d620c04bb7e62d34273d310.zip Qt-36bd47429312f6d78d620c04bb7e62d34273d310.tar.gz Qt-36bd47429312f6d78d620c04bb7e62d34273d310.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativeengine')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp index ee320aa..b0db771 100644 --- a/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp +++ b/tests/auto/declarative/qdeclarativeengine/tst_qdeclarativeengine.cpp @@ -297,6 +297,8 @@ void tst_qdeclarativeengine::objectOwnership() { QObject o; QCOMPARE(QDeclarativeEngine::objectOwnership(&o), QDeclarativeEngine::CppOwnership); + QDeclarativeEngine::setObjectOwnership(&o, QDeclarativeEngine::CppOwnership); + QCOMPARE(QDeclarativeEngine::objectOwnership(&o), QDeclarativeEngine::CppOwnership); QDeclarativeEngine::setObjectOwnership(&o, QDeclarativeEngine::JavaScriptOwnership); QCOMPARE(QDeclarativeEngine::objectOwnership(&o), QDeclarativeEngine::JavaScriptOwnership); QDeclarativeEngine::setObjectOwnership(&o, QDeclarativeEngine::CppOwnership); |