diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-24 10:09:17 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-24 10:09:17 +0200 |
| commit | 84871192077c18bb093c6259339200bd22d64f00 (patch) | |
| tree | 976e0579880d475f6bada6cda41d612db4733a60 /tests/auto/quick/qquicktext | |
| parent | 117da3c1e6f14494693a2ffd96b415ffacc1a05c (diff) | |
| parent | c3c943545eb7f084da314486524e8c9bb2fab431 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
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); |