diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-26 11:52:06 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-26 11:52:32 +0200 |
| commit | 993bc84f49b4922480f6ec566f31c24465f0e005 (patch) | |
| tree | 5189edc8e2e0942459d09a4765ad17dd681fe801 /tests/auto/quick/qquicktext | |
| parent | 713a4c5b1d601f57d538fdbb1e8f6bc05ce07275 (diff) | |
| parent | 84871192077c18bb093c6259339200bd22d64f00 (diff) | |
Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into merge
Change-Id: I5824a3eb624b325de10acfd5109c4c1bdabcf780
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); |