summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2019-06-06 17:36:59 +0200
committerThomas Hartmann <thomas.hartmann@qt.io>2019-06-06 15:56:33 +0000
commit641cc7ee0650b64de042a7d41a88832838ba36f9 (patch)
treea76030e1efd10d83a9c39d32fdc3cbc00b4aae4a
parentcd42ebb840b1711ac85fe47560718f74afc6030c (diff)
downloadqt-creator-641cc7ee0650b64de042a7d41a88832838ba36f9.tar.gz
QmlDesigner: Use new controls in TargetComboBox
Change-Id: I8f65e673843c119de1f910b7e2c4d35fccfd8a94 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TargetComboBox.qml10
1 files changed, 4 insertions, 6 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TargetComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TargetComboBox.qml
index 1e823bdeb0..b500f8c6a7 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TargetComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TargetComboBox.qml
@@ -26,14 +26,16 @@
import QtQuick 2.0
import HelperWidgets 2.0
import QtQuick.Layouts 1.0
-import QtQuick.Controls 1.0 as Controls
+import StudioControls 1.0 as StudioControls
import QtQuickDesignerTheme 1.0
-Controls.ComboBox {
+StudioControls.ComboBox {
property string targetName: anchorBackend.topTarget
property color textColor: Theme.color(Theme.PanelTextColorLight)
+ actionIndicatorVisible: false
+
id: targetComboBox
Connections {
@@ -50,8 +52,4 @@ Controls.ComboBox {
}
model: anchorBackend.possibleTargetItems
-
- style: CustomComboBoxStyle {
- textColor: targetComboBox.textColor
- }
}