diff options
| author | Martin Jones <martin.jones@nokia.com> | 2012-06-12 10:16:47 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-12 03:22:11 +0200 |
| commit | e8206bf6ab6ef62b5dd24bf002aa56edecbcec97 (patch) | |
| tree | eaf05e69ed3233f2eb215d3e9aeb114b8cb62f43 /tests/auto/quick/qquickloader | |
| parent | fb41baa0e8bfab231a2fc1f42ad2d6ffab93ccfc (diff) | |
Allow Loader to load non-Item types.
Loader has a more convenient API for loading/unloading components
than the dynamic object creation APIs. Remove the Item-only
restriction.
Change-Id: I6f9ecc8514ff1e814f7e56a3386814ba211b7e4f
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquickloader')
| -rw-r--r-- | tests/auto/quick/qquickloader/tst_qquickloader.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/auto/quick/qquickloader/tst_qquickloader.cpp b/tests/auto/quick/qquickloader/tst_qquickloader.cpp index 69c75d6187..e7cef8c063 100644 --- a/tests/auto/quick/qquickloader/tst_qquickloader.cpp +++ b/tests/auto/quick/qquickloader/tst_qquickloader.cpp @@ -783,12 +783,17 @@ void tst_QQuickLoader::deleteComponentCrash() void tst_QQuickLoader::nonItem() { QQmlComponent component(&engine, testFileUrl("nonItem.qml")); - QString err = testFileUrl("nonItem.qml").toString() + ":3:1: QML Loader: Loader does not support loading non-visual elements."; - QTest::ignoreMessage(QtWarningMsg, err.toLatin1().constData()); QQuickLoader *loader = qobject_cast<QQuickLoader*>(component.create()); QVERIFY(loader); - QVERIFY(loader->item() == 0); + QVERIFY(loader->item()); + + QCOMPARE(loader, loader->item()->parent()); + + QPointer<QObject> item = loader->item(); + loader->setActive(false); + QVERIFY(!loader->item()); + QTRY_VERIFY(!item); delete loader; } |