summaryrefslogtreecommitdiffstats
path: root/examples/quick/controls
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2013-06-17 16:02:33 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-24 12:10:29 +0200
commit1d1e67f08bbcba973f1582871b87fb35d41c4eaa (patch)
treed25c029e0c574bab3bf40b3527a3416eaadebc4f /examples/quick/controls
parent24ea4d8acf59a4f7c82afd24250591b6e88ff5c4 (diff)
TextArea: switch to Qt.PointingHandCursor when hovering links
Change-Id: I7c306093c1afc9f5dfe942cd29da427c6a57d869 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'examples/quick/controls')
-rw-r--r--examples/quick/controls/gallery/content/Controls.qml1
-rw-r--r--examples/quick/controls/gallery/main.qml2
2 files changed, 2 insertions, 1 deletions
diff --git a/examples/quick/controls/gallery/content/Controls.qml b/examples/quick/controls/gallery/content/Controls.qml
index c1403da58..3bf8191c6 100644
--- a/examples/quick/controls/gallery/content/Controls.qml
+++ b/examples/quick/controls/gallery/content/Controls.qml
@@ -175,6 +175,7 @@ Item {
id: area
frameVisible: frameCheckbox.checked
text: loremIpsum + loremIpsum
+ textFormat: Qt.RichText
wrapMode: wrapCheck.checked ? TextEdit.WordWrap : TextEdit.NoWrap
width: contentRow.width - firstColumn.width - contentRow.spacing
height: parent.height - group1.height - group2.height - 2 * parent.spacing
diff --git a/examples/quick/controls/gallery/main.qml b/examples/quick/controls/gallery/main.qml
index 8ea3cf9e8..1f563c097 100644
--- a/examples/quick/controls/gallery/main.qml
+++ b/examples/quick/controls/gallery/main.qml
@@ -57,7 +57,7 @@ ApplicationWindow {
minimumWidth: 570
property string loremIpsum:
- "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor "+
+ "<a href='lipsum.com'>Lorem ipsum</a> dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor "+
"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor "+
"incididunt ut labore et dolore magna aliqua.\n Ut enim ad minim veniam, quis nostrud "+
"exercitation ullamco laboris nisi ut aliquip ex ea commodo cosnsequat. ";