From ab4edad6ba1b074be7ce309e871845eb9c7091f0 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Wed, 5 Nov 2014 13:41:11 +0100
Subject: QmlDesigner.PropertyEditor: Fix ComboBox drop down menu

We need to style the drop down menu.

Change-Id: Ide5845b06336cc6dff08acc7b5814a06ebde6a1b
Task-number: QTCREATORBUG-13336
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 .../HelperWidgets/CustomComboBoxStyle.qml                        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'share')

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml
index 9a0388bf19..9254f2262a 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml
@@ -30,7 +30,7 @@
 
 import QtQuick 2.1
 import QtQuick.Controls 1.1 as Controls
-import QtQuick.Controls.Styles 1.1
+import QtQuick.Controls.Styles 1.2
 
 ComboBoxStyle {
     property color borderColor: "#222"
@@ -106,4 +106,11 @@ ComboBoxStyle {
             color: textColor
         }
     }
+
+    __dropDownStyle: MenuStyle {
+        __maxPopupHeight: 600
+        __menuItemType: "comboboxitem"
+        frame: Rectangle {
+        }
+    }
 }
-- 
cgit v1.2.1