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/qquicktextedit | |
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/qquicktextedit')
-rw-r--r-- | tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index 09ea35cd9e..6a136aeb7e 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -5084,7 +5084,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); |