Revert "QmlDesigner.PropertyEditor: changed layout combobox"

This reverts commit 622e7234.

share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml

@@ -44,7 +44,7 @@ GroupBox {
                             text: "Target"
                             fixedWidth: targetLabelWidth
                         }
-                        LayoutComboBox {
+                        SiblingComboBox {
                             itemNode: anchorBackend.itemNode
                             selectedItemNode: anchorBackend.topTarget
                             onSelectedItemNodeChanged: { anchorBackend.topTarget = selectedItemNode; }
@@ -92,7 +92,7 @@ GroupBox {
                             text: "Target"
                             fixedWidth: targetLabelWidth
                         }
-                        LayoutComboBox {
+                        SiblingComboBox {
                             itemNode: anchorBackend.itemNode
                             selectedItemNode: anchorBackend.bottomTarget
                             onSelectedItemNodeChanged: { anchorBackend.bottomTarget = selectedItemNode; }
@@ -139,7 +139,7 @@ GroupBox {
                             text: "Target"
                             fixedWidth: targetLabelWidth
                         }
-                        LayoutComboBox {
+                        SiblingComboBox {
                             itemNode: anchorBackend.itemNode
                             selectedItemNode: anchorBackend.leftTarget
                             onSelectedItemNodeChanged: { anchorBackend.leftTarget = selectedItemNode; }
@@ -185,7 +185,7 @@ GroupBox {
                             text: "Target"
                             fixedWidth: targetLabelWidth
                         }
-                        LayoutComboBox {
+                        SiblingComboBox {
                             itemNode: anchorBackend.itemNode
                             selectedItemNode: anchorBackend.rightTarget
                             onSelectedItemNodeChanged: { anchorBackend.rightTarget = selectedItemNode; }
@@ -231,7 +231,7 @@ GroupBox {
                             text: "Target"
                             fixedWidth: targetLabelWidth
                         }
-                        LayoutComboBox {
+                        SiblingComboBox {
                             itemNode: anchorBackend.itemNode
                             selectedItemNode: anchorBackend.horizontalTarget
                             onSelectedItemNodeChanged: { anchorBackend.horizontalTarget = selectedItemNode; }
@@ -277,7 +277,7 @@ GroupBox {
                             text: "Target"
                             fixedWidth: targetLabelWidth
                         }
-                        LayoutComboBox {
+                        SiblingComboBox {
                             itemNode: anchorBackend.itemNode
                             selectedItemNode: anchorBackend.verticalTarget
                             onSelectedItemNodeChanged: { anchorBackend.verticalTarget = selectedItemNode; }

share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutComboBox.qml

-import Qt 4.6
-import Bauhaus 1.0
-
-QWidget {
-    id: layoutComboBox
-    property alias itemNode: comboBox.itemNode
-    property alias selectedItemNode: comboBox.selectedItemNode
-
-    property alias enabled: comboBox.enabled
-
-    property var isEnabled: comboBox.enabled
-    onIsEnabledChanged: {
-        evaluate();
-    }
-
-    // special:  will only be valid in base state
-    Script {
-        function evaluate() {
-            if (!enabled) {
-                comboBox.setStyleSheet("color: "+scheme.disabledColor);
-            } else {
-                comboBox.setStyleSheet("QComboBox,QComboBox:on{color: "+scheme.defaultColor+"}QComboBox:off{color:"+scheme.optionsColor+"}");
-            }
-        }
-    }
-
-    ColorScheme { id:scheme; }
-
-
-    layout: HorizontalLayout {
-        SiblingComboBox {
-            id: comboBox
-        }
-    }
-}