summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2013-11-22 15:46:00 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-27 14:04:17 +0100
commit605f63a1880400a5b540bab60ad68d3612bd71c1 (patch)
tree969bf41277a240495bf48651973403c9b2c96543
parent4e800fafb151f6bbe92aa7b0ba5df5cc1e8f80a9 (diff)
downloadqtquickcontrols-605f63a1880400a5b540bab60ad68d3612bd71c1.tar.gz
qtquickcontrols-605f63a1880400a5b540bab60ad68d3612bd71c1.tar.bz2
qtquickcontrols-605f63a1880400a5b540bab60ad68d3612bd71c1.zip
TextField: Fix binding loop for property font
Change-Id: I752595495a3cb1347eb5f43dcf8ff36044a02e02 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
-rw-r--r--src/controls/TextField.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml
index 0961430d..0bd4db1e 100644
--- a/src/controls/TextField.qml
+++ b/src/controls/TextField.qml
@@ -584,7 +584,7 @@ Control {
selectionColor: __panel ? __panel.selectionColor : "darkred"
selectedTextColor: __panel ? __panel.selectedTextColor : "white"
- font: __panel ? __panel.font : font
+ font: __panel ? __panel.font : undefined
anchors.leftMargin: __panel ? __panel.leftMargin : 0
anchors.topMargin: __panel ? __panel.topMargin : 0
anchors.rightMargin: __panel ? __panel.rightMargin : 0