diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-03 18:36:06 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-04 09:58:36 +0200 |
| commit | 8100261762607d634728b43e2ea5f4b4b595fd59 (patch) | |
| tree | f401274455a4531c63d86a4510a69fc2e9eab430 /src/controls/TextArea.qml | |
| parent | 4cc1b689ef0dab71ed7a6bc798d1388e3c90989c (diff) | |
| download | qtquickcontrols-8100261762607d634728b43e2ea5f4b4b595fd59.tar.gz | |
Fix TextArea's font
Using a Binding element overrides TextArea::font with a value from
TextAreaStyle::font, whereas the style is only supposed to provide
the default value. Use TextSingleton's font to avoid the original
binding loop.
Task-number: QTBUG-39328
Change-Id: I90113ef03dd31b2a060dfe12361708f99b35eb53
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'src/controls/TextArea.qml')
| -rw-r--r-- | src/controls/TextArea.qml | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml index 8cf02857..27747968 100644 --- a/src/controls/TextArea.qml +++ b/src/controls/TextArea.qml @@ -710,12 +710,7 @@ ScrollView { onWrapModeChanged: edit.doLayout() renderType: __style ? __style.renderType : Text.NativeRendering - Binding { - target: edit - property: 'font' - value: __style.font - when: __style - } + font: __style ? __style.font : TextSingleton.font color: __style ? __style.textColor : "darkgray" selectionColor: __style ? __style.selectionColor : "darkred" selectedTextColor: __style ? __style.selectedTextColor : "white" |