diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-05-22 07:49:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-05-22 07:50:29 +0200 |
| commit | e6e7f37afd21a2f5224db367159801d20088d99d (patch) | |
| tree | 658009d72f41f4ab5b3aee1cceaac3957a315ead /src/controls/TextArea.qml | |
| parent | d5709d275542cf9353d84c7da5cd514fa7c6a74c (diff) | |
| parent | 82a0a8244a2edf27c196f6c8cc3e2c36a3f4a8c5 (diff) | |
| download | qtquickcontrols-e6e7f37afd21a2f5224db367159801d20088d99d.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I1537496e887855f3f092189b7304d6614ed5ae5a
Diffstat (limited to 'src/controls/TextArea.qml')
| -rw-r--r-- | src/controls/TextArea.qml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml index e8013156..4974d186 100644 --- a/src/controls/TextArea.qml +++ b/src/controls/TextArea.qml @@ -732,7 +732,12 @@ ScrollView { onWrapModeChanged: edit.doLayout() renderType: __style ? __style.renderType : Text.NativeRendering - font: __style ? __style.font : font + Binding { + target: edit + property: 'font' + value: __style.font + when: __style + } color: __style ? __style.textColor : "darkgray" selectionColor: __style ? __style.selectionColor : "darkred" selectedTextColor: __style ? __style.selectedTextColor : "white" |