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/qml/qqmlinstruction/tst_qqmlinstruction.cpp | |
| 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/qml/qqmlinstruction/tst_qqmlinstruction.cpp')
| -rw-r--r-- | tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp b/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp index 7a59a7f243..44ab690f68 100644 --- a/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp +++ b/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp @@ -158,7 +158,7 @@ void tst_qqmlinstruction::dump() } { - data->urls << QUrl("http://www.nokia.com"); + data->urls << QUrl("http://www.qt-project.org"); QQmlCompiledData::Instruction::StoreUrl i; i.propertyIndex = 8; i.value = data->urls.count() - 1; @@ -501,7 +501,7 @@ void tst_qqmlinstruction::dump() << "8\t\tSTORE_INTEGER\t\t5\t9" << "9\t\tSTORE_BOOL\t\t6\ttrue" << "10\t\tSTORE_STRING\t\t7\t1\t\t\"Test String\"" - << "11\t\tSTORE_URL\t\t8\t0\t\tQUrl(\"http://www.nokia.com\") " + << "11\t\tSTORE_URL\t\t8\t0\t\tQUrl(\"http://www.qt-project.org\") " << "12\t\tSTORE_COLOR\t\t9\t\t\t\"ff00ff00\"" << "13\t\tSTORE_DATE\t\t10\t9" << "14\t\tSTORE_TIME\t\t11" |