diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-06-22 16:28:40 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-25 07:29:12 +0200 |
| commit | 0c64967cf3317d4c9863da3c2fe130f93b27eefa (patch) | |
| tree | 8406b68b344c2a7c691ab4b1990b52a385562d86 /tests/auto/qml | |
| parent | e76ba402bfe309022a0be29c6bc8223f8f3f94b3 (diff) | |
Correctly resolve qrc:/ URLs in type loading
URLS specified with the qrc scheme do not use the 'authority'
part of the syntax, and therefore do not necessarily contain a
double slash immediately after the scheme.
Task-number: QTBUG-25937
Change-Id: I49156b463f11dbb38d6a01d30ea934b0a652c8e5
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/qml')
| -rw-r--r-- | tests/auto/qml/qml.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qrcqml/tst_qrcqml.cpp | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro index e41c261b64..48613a4ce5 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -46,6 +46,7 @@ PRIVATETESTS += \ qquicklistmodelworkerscript \ qquickworkerscript \ qqmlbundle \ + qrcqml \ v4 !contains(QT_CONFIG, no-widgets) { diff --git a/tests/auto/qml/qrcqml/tst_qrcqml.cpp b/tests/auto/qml/qrcqml/tst_qrcqml.cpp index f5d7dd544c..b81fff0f08 100644 --- a/tests/auto/qml/qrcqml/tst_qrcqml.cpp +++ b/tests/auto/qml/qrcqml/tst_qrcqml.cpp @@ -66,9 +66,6 @@ void tst_qrcqml::basicLoad() { QQmlEngine e; QQmlComponent c(&e, QUrl("qrc:/main.qml")); - if (c.isError()) - qDebug() << "Error: " << c.errors(); - QEXPECT_FAIL("", "QTBUG-25937", Abort); QVERIFY(c.isReady()); QObject* o = c.create(); QVERIFY(o); |