diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 09:48:35 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 09:48:36 +0100 |
| commit | 8d5a2f2a81a001ff64e1a798dc34c61e9ad00b6d (patch) | |
| tree | 22c73b798dc55c47a6b3524eb79aed85716abf59 /tests/testapplications | |
| parent | 84155a8e1a6250d3e4b0949a42464eee5dfef537 (diff) | |
| parent | dec6b8a8d294bc6193f680c5b5038dc12b6ae17c (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I4c338a44c1d64c2d8e637971ab3ec6982c40a685
Diffstat (limited to 'tests/testapplications')
| -rw-r--r-- | tests/testapplications/text/textedit.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/testapplications/text/textedit.qml b/tests/testapplications/text/textedit.qml index 54989afd47..6b2a89a713 100644 --- a/tests/testapplications/text/textedit.qml +++ b/tests/testapplications/text/textedit.qml @@ -136,7 +136,7 @@ Rectangle { "and a language runtime. "+ "A collection of C++ APIs is used to integrate these high level features with classic Qt applications."}); textmodel.append({ "name": "Links", - "value": "This is a link - <a href=\"http://qt-project.org/doc\">Qt Docs</a>"}); + "value": "This is a link - <a href=\"http://doc.qt.io/\">Qt Docs</a>"}); } } ControlView { |