summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml2
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml6
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml5
-rw-r--r--share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml1
4 files changed, 2 insertions, 12 deletions
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
index 1cb4b09cc0..c2dbbbb122 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
@@ -9,7 +9,6 @@ QExtGroupBox {
property var backendColor
property var oldMaximumHeight;
- height: 180
onFinishedChanged: {
maximumHeight = height;
@@ -65,7 +64,6 @@ QExtGroupBox {
topMargin: 36
QWidget {
- maximumHeight: 140;
layout: HorizontalLayout {
ColorBox {
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml
index 70d1dd2174..5bc40eb54f 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml
@@ -10,19 +10,15 @@ QScrollArea {
visible: false;
content: properyEditorExtended;
QFrame {
- minimumHeight: 440;
id: properyEditorExtended
layout: QVBoxLayout {
topMargin: 0;
bottomMargin: 0;
leftMargin: 0;
rightMargin: 0;
- spacing: 0;
+ spacing: 0;
Modifiers {
}
-// Extended {
-// id: extendedBox;
-// }
QScrollArea {
}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
index 71fdcc4364..271a5ffafd 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
@@ -4,7 +4,6 @@ import Bauhaus 1.0
GroupBox {
id: rectangleColorGroupBox
- finished: finishedNotify;
caption: "Colors"
layout: VerticalLayout {
@@ -13,10 +12,6 @@ GroupBox {
text: " Color"
}
-// ColorTypeButtons {
-//
-// }
-
ColorGroupBox {
finished: finishedNotify
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml
index d58bb6c8d6..acd9bae4af 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml
@@ -11,6 +11,7 @@ QWidget {
spacing: 0
RectangleColorGroupBox {
+ finished: finishedNotify;
}
GroupBox {