From 7d21caabdb98660439f81da51bb212d5d857ce02 Mon Sep 17 00:00:00 2001
From: Aleksei German <aleksei.german@qt.io>
Date: Fri, 18 Sep 2020 16:15:09 +0200
Subject: [PATCH] QmlDesigner: Minor Fixes for QDS MCU compatibility

Change-Id: I401ecf9ce12d7020e78a5449b321fb7927caffed
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml    | 3 ++-
 .../components/connectioneditor/connectionmodel.cpp            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml
index 3cd5d90399f..f743af96e05 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/RectangleSpecifics.qml
@@ -64,18 +64,19 @@ Column {
         anchors.left: parent.left
         anchors.right: parent.right
         caption: "Rectangle"
-        visible: backendValues.border_color.isAvailable
 
         SectionLayout {
             rows: 2
             Label {
                 text: qsTr("Border")
+                disabledState: !backendValues.border_width.isAvailable
             }
             SecondColumnLayout {
                 SpinBox {
                     backendValue: backendValues.border_width
                     hasSlider: true
                     Layout.preferredWidth: 120
+                    enabled: backendValue.isAvailable
                 }
                 ExpandingSpacer {
 
diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp
index 2fd2364596c..69e0e202f40 100644
--- a/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp
+++ b/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp
@@ -303,7 +303,7 @@ void ConnectionModel::addConnection()
                 ModelNode newNode = connectionView()->createModelNode("QtQuick.Connections",
                                                                       nodeMetaInfo.majorVersion(),
                                                                       nodeMetaInfo.minorVersion());
-                QString source = "print(\"clicked\")";
+                QString source = "console.log(\"clicked\")";
 
                 if (connectionView()->selectedModelNodes().count() == 1) {
                     ModelNode selectedNode = connectionView()->selectedModelNodes().constFirst();