diff options
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/qml/qqmlerror/tst_qqmlerror.cpp | 8 | ||||
-rw-r--r-- | tests/auto/qml/qqmlinfo/tst_qqmlinfo.cpp | 8 | ||||
-rw-r--r-- | tests/auto/quick/qquickanchors/data/loop2.qml | 4 | ||||
-rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 2 | ||||
-rw-r--r-- | tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/qml/qqmlerror/tst_qqmlerror.cpp b/tests/auto/qml/qqmlerror/tst_qqmlerror.cpp index 65e8e65c89..44fbb0a982 100644 --- a/tests/auto/qml/qqmlerror/tst_qqmlerror.cpp +++ b/tests/auto/qml/qqmlerror/tst_qqmlerror.cpp @@ -72,9 +72,9 @@ void tst_qqmlerror::url() QCOMPARE(error2.url(), QUrl("http://www.qt-project.org/main.qml")); - error.setUrl(QUrl("http://qt.nokia.com/main.qml")); + error.setUrl(QUrl("http://www.qt-project.org/main.qml")); - QCOMPARE(error.url(), QUrl("http://qt.nokia.com/main.qml")); + QCOMPARE(error.url(), QUrl("http://www.qt-project.org/main.qml")); QCOMPARE(error2.url(), QUrl("http://www.qt-project.org/main.qml")); } @@ -172,12 +172,12 @@ void tst_qqmlerror::copy() QQmlError error3; error3 = error; - error.setUrl(QUrl("http://qt.nokia.com/main.qml")); + error.setUrl(QUrl("http://www.qt-project.org/main.qml")); error.setDescription("Another Error"); error.setLine(2); error.setColumn(33); - QCOMPARE(error.url(), QUrl("http://qt.nokia.com/main.qml")); + QCOMPARE(error.url(), QUrl("http://www.qt-project.org/main.qml")); QCOMPARE(error.description(), QString("Another Error")); QCOMPARE(error.line(), 2); QCOMPARE(error.column(), 33); diff --git a/tests/auto/qml/qqmlinfo/tst_qqmlinfo.cpp b/tests/auto/qml/qqmlinfo/tst_qqmlinfo.cpp index c0fb13c932..7a964a1fcb 100644 --- a/tests/auto/qml/qqmlinfo/tst_qqmlinfo.cpp +++ b/tests/auto/qml/qqmlinfo/tst_qqmlinfo.cpp @@ -179,8 +179,8 @@ void tst_qqmlinfo::types() //### do we actually want QUrl to show up in the output? //### why the extra space at the end? - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QUrl(\"http://qt.nokia.com\") "); - qmlInfo(0) << QUrl("http://qt.nokia.com"); + QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QUrl(\"http://www.qt-project.org\") "); + qmlInfo(0) << QUrl("http://www.qt-project.org"); //### should this be quoted? QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: hello"); @@ -202,14 +202,14 @@ void tst_qqmlinfo::chaining() //### should more of these be automatically inserting spaces? QString str("Hello World"); QStringRef ref(&str, 6, 5); - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: false 1.1 1.2 15 hello 'b' QUrl(\"http://qt.nokia.com\") World \"Qt\" true Quick "); + QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: false 1.1 1.2 15 hello 'b' QUrl(\"http://www.qt-project.org\") World \"Qt\" true Quick "); qmlInfo(0) << false << ' ' << 1.1 << ' ' << 1.2f << ' ' << 15 << ' ' << QLatin1String("hello") << ' ' << QChar('b') << ' ' - << QUrl("http://qt.nokia.com") + << QUrl("http://www.qt-project.org") << ref << QByteArray("Qt") << bool(true) diff --git a/tests/auto/quick/qquickanchors/data/loop2.qml b/tests/auto/quick/qquickanchors/data/loop2.qml index 044152989e..ba6f07f680 100644 --- a/tests/auto/quick/qquickanchors/data/loop2.qml +++ b/tests/auto/quick/qquickanchors/data/loop2.qml @@ -7,13 +7,13 @@ Rectangle { Image { id: image1 - source: "http://labs.qt.nokia.com/blogs/wp-content/uploads/2009/03/3311388091_ac2a257feb.jpg" + source: "http://blog.qt.digia.com/wp-content/uploads/2013/07/Qt-team-Oslo1.jpeg" anchors.right: image2.left } Image { id: image2 - source: "http://labs.qt.nokia.com/blogs/wp-content/uploads/2009/03/oslo_groupphoto.jpg" + source: "http://blog.qt.digia.com/wp-content/uploads/2013/07/Qt-team-Oslo1.jpeg" anchors.left: image1.right anchors.leftMargin: 20 } diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index fb3b62b8d2..6637d36318 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -1844,7 +1844,7 @@ void tst_qquicktext::clickLink() void tst_qquicktext::baseUrl() { QUrl localUrl("file:///tests/text.qml"); - QUrl remoteUrl("http://qt.nokia.com/test.qml"); + QUrl remoteUrl("http://www.qt-project.org/test.qml"); QQmlComponent textComponent(&engine); textComponent.setData("import QtQuick 2.0\n Text {}", localUrl); diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index bce1f9e4a2..667d52ee7a 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -4918,7 +4918,7 @@ void tst_qquicktextedit::undo_keypressevents() void tst_qquicktextedit::baseUrl() { QUrl localUrl("file:///tests/text.qml"); - QUrl remoteUrl("http://qt.nokia.com/test.qml"); + QUrl remoteUrl("http://www.qt-project.org/test.qml"); QQmlComponent textComponent(&engine); textComponent.setData("import QtQuick 2.0\n TextEdit {}", localUrl); |