summaryrefslogtreecommitdiff
path: root/src/controls/ComboBox.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2014-05-05 17:37:00 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-05 20:47:16 +0200
commite0f2fe95a5c323825da79b5bed98745c437715ab (patch)
tree3662bc4eaccf44318ffcdb425316eab7ca8c646f /src/controls/ComboBox.qml
parent4b05f89608fa8a4070b1046bed123b2115a771f9 (diff)
downloadqtquickcontrols-e0f2fe95a5c323825da79b5bed98745c437715ab.tar.gz
ComboBox: let style specify a font for the editor
Change-Id: I6a65309d35ad3d50116a69b85ad88093399b0457 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/controls/ComboBox.qml')
-rw-r--r--src/controls/ComboBox.qml1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml
index c130abe8..c9f24b52 100644
--- a/src/controls/ComboBox.qml
+++ b/src/controls/ComboBox.qml
@@ -358,6 +358,7 @@ Control {
verticalAlignment: Text.AlignVCenter
+ font: __style && __style.editorFont !== undefined ? __style.editorFont : TextSingleton.font
renderType: __style ? __style.renderType : Text.NativeRendering
selectByMouse: true
color: __style.__syspal.text