diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml index 45659351a74d8b6e08babe834e310a84077bf2e1..04131da10ed318da9223f4dc420d7fc47980d36c 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml @@ -18,8 +18,7 @@ GroupBox { baseStateFlag: isBaseState } } - } - + } QWidget { id: sizeWidget property bool selectionFlag: selectionChanged @@ -33,8 +32,7 @@ GroupBox { if (backendValues.font_pixelSize.isInModel) sizeType.currentText = "pixels"; isSetup = false; - } - + } layout: HorizontalLayout { Label { text: qsTr("Size") @@ -65,28 +63,21 @@ GroupBox { } } } - } - - - + } QWidget { layout: HorizontalLayout { Label { text: qsTr("Font Style") } - FontStyleButtons {} - } } - QWidget { visible: showStyle layout: HorizontalLayout { Label { text: qsTr("Style") } - ComboBox { baseStateFlag:isBaseState backendValue: (backendValues.style === undefined) ? dummyBackendValue : backendValues.style diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontStyleButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontStyleButtons.qml index fa18d11d11fe0bf7f7e40de9b2e5b911299d137c..0abd7f7e89ff88f5ac3b112daf4a5379b24ef54b 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontStyleButtons.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontStyleButtons.qml @@ -6,7 +6,6 @@ QGroupBox { property int buttonWidth: 46 layout: HorizontalLayout { - topMargin: 6 QWidget { fixedHeight: 32 diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml index 2dc4eaceb2e9398cde008ee9dfdd61d3dec796c0..9704bdc530ebb59da85bf416a62086248f3f8299 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml @@ -12,11 +12,9 @@ GroupBox { layout: VerticalLayout { QWidget { layout: HorizontalLayout { - Label { text: qsTr("Text") } - LineEdit { backendValue: backendValues.text baseStateFlag: isBaseState; @@ -37,12 +35,10 @@ GroupBox { onItemsChanged: { currentText = backendValues.wrapMode.value; } - backendValue: backendValues.wrapMode } } } - QWidget { layout: HorizontalLayout {