diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-04 23:11:14 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-06-04 23:13:24 +0200 |
| commit | efacf765b008571d8feeb3423e5af5bcb8426219 (patch) | |
| tree | 1f44b47b0d9a9efd4a00e33943d9c3c0477ec7eb /src/controls/TextField.qml | |
| parent | 8e7e0c7db6edd43bf80fa954cd50015b90f07205 (diff) | |
| parent | ca06986af37dad834afe7f6c81eb20d0751c6d78 (diff) | |
| download | qtquickcontrols-efacf765b008571d8feeb3423e5af5bcb8426219.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ife57f59094cb9be9c5e8a187df8d1fd25110a53a
Diffstat (limited to 'src/controls/TextField.qml')
| -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 a248618a..a20a5c40 100644 --- a/src/controls/TextField.qml +++ b/src/controls/TextField.qml @@ -601,7 +601,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 |