From 40d5534cd5905c9020c964344fe069839f3bca39 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 3 Jun 2014 19:53:26 +0200 Subject: 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 Reviewed-by: Caroline Chao --- src/controls/TextField.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/controls/TextField.qml') diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml index 501337a4b..32992b735 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 -- cgit v1.2.3