feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Minor Fixes for QDS MCU compatibility

Browse Source 
Change-Id: I401ecf9ce12d7020e78a5449b321fb7927caffed
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Aleksei German
2020-09-18 16:15:09 +02:00
committed by Thomas Hartmann
parent bdbb0baa0f
commit 7d21caabdb
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml
View File

@@ -64,18 +64,19 @@ Column {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
caption: "Rectangle" caption: "Rectangle"
visible: backendValues.border_color.isAvailable
SectionLayout { SectionLayout {
rows: 2 rows: 2
Label { Label {
text: qsTr("Border") text: qsTr("Border")
disabledState: !backendValues.border_width.isAvailable
} }
SecondColumnLayout { SecondColumnLayout {
SpinBox { SpinBox {
backendValue: backendValues.border_width backendValue: backendValues.border_width
hasSlider: true hasSlider: true
Layout.preferredWidth: 120 Layout.preferredWidth: 120
enabled: backendValue.isAvailable
} }
ExpandingSpacer { ExpandingSpacer {

2
src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp
View File

@@ -303,7 +303,7 @@ void ConnectionModel::addConnection()
ModelNode newNode = connectionView()->createModelNode("QtQuick.Connections", ModelNode newNode = connectionView()->createModelNode("QtQuick.Connections",
nodeMetaInfo.majorVersion(), nodeMetaInfo.majorVersion(),
nodeMetaInfo.minorVersion()); nodeMetaInfo.minorVersion());
QString source = "print(\"clicked\")"; QString source = "console.log(\"clicked\")";
if (connectionView()->selectedModelNodes().count() == 1) { if (connectionView()->selectedModelNodes().count() == 1) {
ModelNode selectedNode = connectionView()->selectedModelNodes().constFirst(); ModelNode selectedNode = connectionView()->selectedModelNodes().constFirst();