aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlxmlhttprequest
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2013-07-26 11:52:06 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-07-26 11:52:32 +0200
commit993bc84f49b4922480f6ec566f31c24465f0e005 (patch)
tree5189edc8e2e0942459d09a4765ad17dd681fe801 /tests/auto/qml/qqmlxmlhttprequest
parent713a4c5b1d601f57d538fdbb1e8f6bc05ce07275 (diff)
parent84871192077c18bb093c6259339200bd22d64f00 (diff)
Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into merge
Diffstat (limited to 'tests/auto/qml/qqmlxmlhttprequest')
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/open_arg_count.2.qml2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/open_invalid_method.qml2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/open_sync.qml2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/open_arg_count.2.qml b/tests/auto/qml/qqmlxmlhttprequest/data/open_arg_count.2.qml
index 677759ccf3..9a4e76bb6a 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/open_arg_count.2.qml
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/open_arg_count.2.qml
@@ -7,7 +7,7 @@ QtObject {
var x = new XMLHttpRequest;
try {
- x.open("GET", "http://www.nokia.com", true, "user", "password", "extra");
+ x.open("GET", "http://www.qt-project.org", true, "user", "password", "extra");
} catch (e) {
if (e.code == DOMException.SYNTAX_ERR)
exceptionThrown = true;
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/open_invalid_method.qml b/tests/auto/qml/qqmlxmlhttprequest/data/open_invalid_method.qml
index 0f29031e42..09ba1b5581 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/open_invalid_method.qml
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/open_invalid_method.qml
@@ -7,7 +7,7 @@ QtObject {
var x = new XMLHttpRequest;
try {
- x.open("BLAH", "http://www.nokia.com");
+ x.open("BLAH", "http://www.qt-project.org");
} catch (e) {
if (e.code == DOMException.SYNTAX_ERR)
exceptionThrown = true;
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/open_sync.qml b/tests/auto/qml/qqmlxmlhttprequest/data/open_sync.qml
index eafdda761f..0f31c966fa 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/data/open_sync.qml
+++ b/tests/auto/qml/qqmlxmlhttprequest/data/open_sync.qml
@@ -7,7 +7,7 @@ QtObject {
var x = new XMLHttpRequest;
try {
- x.open("GET", "http://www.nokia.com", false);
+ x.open("GET", "http://www.qt-project.org", false);
} catch (e) {
if (e.code == DOMException.NOT_SUPPORTED_ERR)
exceptionThrown = true;