diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-03 19:53:26 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-04 09:58:50 +0200 |
| commit | 40d5534cd5905c9020c964344fe069839f3bca39 (patch) | |
| tree | 916245651a7ecfe3d6fbc5b2d0ca47c9a9da19df | |
| parent | 8100261762607d634728b43e2ea5f4b4b595fd59 (diff) | |
| download | qtquickcontrols-40d5534cd5905c9020c964344fe069839f3bca39.tar.gz | |
TextField::font: fix the default value handling
Assigning undefined to font is not possible, so use TextSingleton::font
as a fallback instead of undefined.
Change-Id: If148f7773ca784c0a1eb78f952dfad073fa9b1e3
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| -rw-r--r-- | src/controls/TextField.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml index 501337a4..32992b73 100644 --- a/src/controls/TextField.qml +++ b/src/controls/TextField.qml @@ -593,7 +593,7 @@ Control { selectionColor: __panel ? __panel.selectionColor : "darkred" selectedTextColor: __panel ? __panel.selectedTextColor : "white" - font: __panel ? __panel.font : undefined + font: __panel ? __panel.font : TextSingleton.font anchors.leftMargin: __panel ? __panel.leftMargin : 0 anchors.topMargin: __panel ? __panel.topMargin : 0 anchors.rightMargin: __panel ? __panel.rightMargin : 0 |