diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-04-13 03:39:25 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-04-13 03:39:25 (GMT) |
| commit | c098135feb4a5370462b4a18529226af5cb7002f (patch) | |
| tree | 492ce48cb0b3816ae76a138469f9bcd22dca5095 /tests | |
| parent | d9e3aa18dd93ac7e80abb6c904ae6cb48953ff07 (diff) | |
| download | Qt-c098135feb4a5370462b4a18529226af5cb7002f.zip Qt-c098135feb4a5370462b4a18529226af5cb7002f.tar.gz Qt-c098135feb4a5370462b4a18529226af5cb7002f.tar.bz2 | |
Remote content is *required* to have qmldir; fix test.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeloader/data/qmldir | 1 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeloader/data/qmldir b/tests/auto/declarative/qdeclarativeloader/data/qmldir new file mode 100644 index 0000000..bf42b50 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeloader/data/qmldir @@ -0,0 +1 @@ +# For tst_QDeclarativeLoader::networkRequestUrl; no types needed though. diff --git a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp index abdd210..20e709d 100644 --- a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp +++ b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp @@ -412,7 +412,9 @@ void tst_QDeclarativeLoader::networkRequestUrl() server.serveDirectory(SRCDIR "/data"); QDeclarativeComponent component(&engine); - component.setData(QByteArray("import Qt 4.6\nLoader { source: \"http://127.0.0.1:14445/Rect120x60.qml\" }"), QUrl("http://127.0.0.1:14445/dummy.qml")); + component.setData(QByteArray("import Qt 4.6\nLoader { source: \"http://127.0.0.1:14445/Rect120x60.qml\" }"), QUrl(SRCDIR "/dummy.qml")); + if (component.isError()) + qDebug() << component.errors(); QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create()); QVERIFY(loader != 0); |