summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativeloader
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-03-24 03:03:19 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-03-24 03:03:19 (GMT)
commit4d82dd604c4f6aedbf3ed0eabcf89d3dca3d0a88 (patch)
treed0dac934b956613d6bedefa79f90f6523b639c08 /tests/auto/declarative/qdeclarativeloader
parent838e4cc024f4589322d5279acd96e3ca4d00e1f5 (diff)
downloadQt-4d82dd604c4f6aedbf3ed0eabcf89d3dca3d0a88.zip
Qt-4d82dd604c4f6aedbf3ed0eabcf89d3dca3d0a88.tar.gz
Qt-4d82dd604c4f6aedbf3ed0eabcf89d3dca3d0a88.tar.bz2
Origin safety testing for imported resources.
Extends upon 95aa8c8fc76e2309a629b05994a2677b0887140b. Still under discussion.
Diffstat (limited to 'tests/auto/declarative/qdeclarativeloader')
-rw-r--r--tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
index 0deac3a..f27c1ce 100644
--- a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
+++ b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
@@ -491,7 +491,7 @@ void tst_QDeclarativeLoader::networkSafety_data()
QTest::addColumn<QString>("message");
QTest::newRow("same origin") << QUrl("http://127.0.0.1:14445/sameorigin.qml") << QString();
- QTest::newRow("different origin") << QUrl("http://127.0.0.1:14445/differentorigin.qml") << QString(" QUrl( \"http://evil.place/evil.qml\" ) is not a safe origin from QUrl( \"http://127.0.0.1:14445/differentorigin.qml\" ) ");
+ QTest::newRow("different origin") << QUrl("http://127.0.0.1:14445/differentorigin.qml") << QString("QML Loader (http://127.0.0.1:14445/differentorigin.qml:3:1) \"http://evil.place/evil.qml\" is not a safe origin from \"http://127.0.0.1:14445/differentorigin.qml\"");
}
void tst_QDeclarativeLoader::networkSafety()