diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-03-28 17:04:53 +0100 |
---|---|---|
committer | Jari-Pekka Nurmi <jpnurmi@theqtcompany.com> | 2015-03-28 21:00:37 +0200 |
commit | 74d43b9c9982474dca9f14ac3cab8377bfcf9b7f (patch) | |
tree | 2a34229553b7b2443d71a2e5e99caec7ea280801 | |
parent | 28a38f2b17c10fd3f62e769607e0ebbc73bfc8d4 (diff) |
Specify link color & use StyledText
Change-Id: If6d087b4bb66bf4d293a8bcccf3ab01fa9266152
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
-rw-r--r-- | examples/quick/controls/tabs/main.qml | 4 | ||||
-rw-r--r-- | src/imports/controls/Label.qml | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/examples/quick/controls/tabs/main.qml b/examples/quick/controls/tabs/main.qml index 42902298..38db6e87 100644 --- a/examples/quick/controls/tabs/main.qml +++ b/examples/quick/controls/tabs/main.qml @@ -129,7 +129,7 @@ ApplicationWindow { } Label { text: model.description - textFormat: Qt.RichText + textFormat: Text.StyledText x: Style.padding width: parent.width - 2 * Style.padding wrapMode: Text.WordWrap @@ -220,7 +220,7 @@ ApplicationWindow { Item { width: 1; height: Style.spacing } Label { text: model.description - textFormat: Qt.RichText + textFormat: Text.StyledText x: Style.padding width: parent.width - 2 * Style.padding wrapMode: Text.WordWrap diff --git a/src/imports/controls/Label.qml b/src/imports/controls/Label.qml index 2cd3e5fa..2f5868b5 100644 --- a/src/imports/controls/Label.qml +++ b/src/imports/controls/Label.qml @@ -44,4 +44,5 @@ AbstractLabel { Accessible.role: Accessible.StaticText color: Style.textColor + linkColor: Style.focusColor // TODO } |