diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:10:37 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:10:39 +0200 |
| commit | c3c943545eb7f084da314486524e8c9bb2fab431 (patch) | |
| tree | 6add1fea19fdec25af587e2f38c788c391501b7a /tests/auto/quick/qquicktext | |
| parent | cf62652614676f58f9c45102a67a497c81805a36 (diff) | |
| parent | e443c7ba5552e5c88c331b370cc7a338d8672494 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I2279f181b1c30e81651f8907447ec5c826e11475
Diffstat (limited to 'tests/auto/quick/qquicktext')
| -rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index fdaa1d6617..32099ae187 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -1914,7 +1914,7 @@ void tst_qquicktext::linkInteraction() 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); |