From 4a0da87a76ff352aa25e861e66b2c4e7bbf87994 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Tue, 7 Jan 2020 13:05:25 +0100 Subject: [PATCH] QmlDesigner: PropertyEditor Controls 1 cleanup Change-Id: I52b83d50a99a7ff24718ed3d99f9ad7cb4415565 Reviewed-by: Thomas Hartmann --- .../propertyEditorQmlSources/QtQuick/AnchorRow.qml | 1 - .../imports/HelperWidgets/ActionIndicator.qml | 1 - .../imports/HelperWidgets/CheckBox.qml | 1 - .../imports/HelperWidgets/ColorButton.qml | 1 - .../imports/HelperWidgets/ColorLine.qml | 1 - .../imports/HelperWidgets/ComboBox.qml | 1 - .../imports/HelperWidgets/GradientLine.qml | 1 - .../propertyEditorQmlSources/imports/HelperWidgets/Label.qml | 5 ++--- .../imports/HelperWidgets/LineEdit.qml | 1 - .../imports/HelperWidgets/MarginSection.qml | 1 - .../imports/HelperWidgets/PaddingSection.qml | 1 - .../imports/HelperWidgets/SecondColumnLayout.qml | 1 - .../imports/HelperWidgets/SectionLayout.qml | 1 - .../imports/HelperWidgets/SimpleColorPalette.qml | 2 -- .../imports/HelperWidgets/SpinBox.qml | 1 - .../imports/HelperWidgets/UrlChooser.qml | 1 - 16 files changed, 2 insertions(+), 19 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnchorRow.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnchorRow.qml index 16f82787b38..7d18d6a1f98 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnchorRow.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnchorRow.qml @@ -26,7 +26,6 @@ import QtQuick 2.0 import HelperWidgets 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Controls 1.0 as Controls import QtQuickDesignerTheme 1.0 import StudioControls 1.0 as StudioControls diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ActionIndicator.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ActionIndicator.qml index 8be58f0bed6..f8925d00617 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ActionIndicator.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ActionIndicator.qml @@ -25,7 +25,6 @@ import QtQuick 2.1 import StudioControls 1.0 as StudioControls -import QtQuick.Controls.Styles 1.1 StudioControls.ActionIndicator { } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml index e599088e426..c3388ab759d 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml @@ -25,7 +25,6 @@ import QtQuick 2.1 import StudioControls 1.0 as StudioControls -import QtQuick.Controls.Styles 1.1 StudioControls.CheckBox { id: checkBox diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml index e44fb8ba553..8381513548f 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml @@ -24,7 +24,6 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 as Controls Item { id: colorButton diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorLine.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorLine.qml index c7256ba8929..18d9750be09 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorLine.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorLine.qml @@ -25,7 +25,6 @@ import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Controls.Private 1.0 // showing a ToolTip Item { width: 300 diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml index eb6fc60476f..ad3e7b25b01 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml @@ -24,7 +24,6 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls.Styles 1.1 import StudioControls 1.0 as StudioControls import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientLine.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientLine.qml index f1886ada433..e032893f5b8 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientLine.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientLine.qml @@ -25,7 +25,6 @@ import QtQuick 2.1 import HelperWidgets 2.0 -import QtQuick.Controls.Private 1.0 // showing a ToolTip Item { width: 300 diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Label.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Label.qml index ce1a0d41540..127ffa6ac9d 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Label.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Label.qml @@ -24,13 +24,12 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.1 as Controls import QtQuick.Layouts 1.0 -import QtQuick.Controls.Private 1.0 +import QtQuick.Controls 2.12 import QtQuickDesignerTheme 1.0 import StudioTheme 1.0 as StudioTheme -Controls.Label { +Label { id: label property alias tooltip: toolTipArea.tooltip diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml index 90e222beadc..5b6478adb1a 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml @@ -26,7 +26,6 @@ import QtQuick 2.2 import StudioControls 1.0 as StudioControls import StudioTheme 1.0 as StudioTheme -import QtQuick.Controls.Styles 1.0 import QtQuickDesignerTheme 1.0 StudioControls.TextField { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/MarginSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/MarginSection.qml index 0143674c9a9..fb761d6e20b 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/MarginSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/MarginSection.qml @@ -26,7 +26,6 @@ import QtQuick 2.1 import HelperWidgets 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Controls 1.0 as Controls Section { caption: qsTr("Margin") diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/PaddingSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/PaddingSection.qml index 318807eb55d..83aceb8644f 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/PaddingSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/PaddingSection.qml @@ -26,7 +26,6 @@ import QtQuick 2.1 import HelperWidgets 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Controls 1.0 as Controls Section { caption: qsTr("Padding") diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SecondColumnLayout.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SecondColumnLayout.qml index d7efcdb9825..3001b6fde19 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SecondColumnLayout.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SecondColumnLayout.qml @@ -24,7 +24,6 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 as Controls import QtQuick.Layouts 1.0 RowLayout { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SectionLayout.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SectionLayout.qml index 6863ed39ded..dd557d235f3 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SectionLayout.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SectionLayout.qml @@ -24,7 +24,6 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 as Controls import QtQuick.Layouts 1.0 GridLayout { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml index d69fc08e4b6..3e9e04cf996 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml @@ -24,10 +24,8 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 2.5 import StudioControls 1.0 as StudioControls import HelperWidgets 2.0 -import QtQuick.Controls.Private 1.0 // showing a ToolTip Item { property color selectedColor diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml index bf42b964152..94bcb5bc1e4 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml @@ -24,7 +24,6 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls.Styles 1.1 import StudioControls 1.0 as StudioControls import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml index 3c314cfea64..7e23ccc6820 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml @@ -28,7 +28,6 @@ import HelperWidgets 2.0 import StudioControls 1.0 as StudioControls import StudioTheme 1.0 as StudioTheme import QtQuick.Layouts 1.0 -import QtQuick.Controls.Styles 1.1 RowLayout { id: urlChooser