forked from qt-creator/qt-creator
QmlDesigner: Use new controls in UrlChooser
Change-Id: I07e6110f4e2d2c7458860db0432fb58afacf7015 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
@@ -25,7 +25,7 @@
|
||||
|
||||
import QtQuick 2.1
|
||||
import HelperWidgets 2.0
|
||||
import QtQuick.Controls 1.1 as Controls
|
||||
import StudioControls 1.0 as StudioControls
|
||||
import QtQuick.Layouts 1.0
|
||||
import QtQuick.Controls.Styles 1.1
|
||||
|
||||
@@ -49,14 +49,16 @@ RowLayout {
|
||||
backendValue: urlChooser.backendValue
|
||||
}
|
||||
|
||||
Controls.ComboBox {
|
||||
StudioControls.ComboBox {
|
||||
id: comboBox
|
||||
|
||||
ExtendedFunctionButton {
|
||||
x: 2
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
backendValue: urlChooser.backendValue
|
||||
visible: urlChooser.enabled
|
||||
actionIndicator.icon.color: extFuncLogic.color
|
||||
actionIndicator.icon.text: extFuncLogic.glyph
|
||||
actionIndicator.onClicked: extFuncLogic.show()
|
||||
|
||||
ExtendedFunctionLogic {
|
||||
id: extFuncLogic
|
||||
backendValue: comboBox.backendValue
|
||||
}
|
||||
|
||||
property bool isComplete: false
|
||||
@@ -86,9 +88,6 @@ RowLayout {
|
||||
Layout.fillWidth: true
|
||||
|
||||
editable: true
|
||||
style: CustomComboBoxStyle {
|
||||
textColor: urlChooser.textColor
|
||||
}
|
||||
|
||||
model: fileModel.fileModel
|
||||
|
||||
|
||||
Reference in New Issue
Block a user