From 3ad3a5f197f54078066f9fd6b8d6c6c54fb93cf0 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Tue, 16 Jan 2024 12:12:52 +0100 Subject: [PATCH] QmlDesigner: Remove unnecessary imports Remove QtQuickDesignerTheme import if not needed. Task-number: QDS-11177 Change-Id: Ia72001855bb636bfc2ddf11cbb00359fbe123c90 Reviewed-by: Mahmoud Badri Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Reviewed-by: Thomas Hartmann --- .../qmldesigner/collectionEditorQmlSource/CollectionView.qml | 1 - .../qmldesigner/collectionEditorQmlSource/ImportDialog.qml | 1 - .../collectionEditorQmlSource/NewCollectionDialog.qml | 1 - .../qmldesigner/contentLibraryQmlSource/ContentLibrary.qml | 1 - .../contentLibraryQmlSource/ContentLibraryEffect.qml | 1 - .../contentLibraryQmlSource/ContentLibraryMaterial.qml | 1 - .../contentLibraryQmlSource/ContentLibraryTexture.qml | 1 - .../contentLibraryQmlSource/UnimportBundleMaterialDialog.qml | 1 - .../qmldesigner/edit3dQmlSource/BakeLightsProgressDialog.qml | 1 - .../qmldesigner/edit3dQmlSource/BakeLightsSetupDialog.qml | 1 - .../qmldesigner/edit3dQmlSource/SnapConfigurationDialog.qml | 1 - .../effectMakerQmlSources/EffectCompositionNode.qml | 1 - .../effectMakerQmlSources/EffectCompositionNodeUniform.qml | 1 - .../qmldesigner/effectMakerQmlSources/EffectMakerPreview.qml | 1 - .../qmldesigner/effectMakerQmlSources/EffectMakerTopBar.qml | 1 - .../qtcreator/qmldesigner/effectMakerQmlSources/EffectNode.qml | 1 - .../qmldesigner/effectMakerQmlSources/EffectNodesComboBox.qml | 1 - .../effectMakerQmlSources/PreviewImagesComboBox.qml | 1 - .../qtcreator/qmldesigner/effectMakerQmlSources/ValueBool.qml | 1 - .../qtcreator/qmldesigner/effectMakerQmlSources/ValueColor.qml | 1 - .../qmldesigner/effectMakerQmlSources/ValueDefine.qml | 1 - .../qtcreator/qmldesigner/effectMakerQmlSources/ValueFloat.qml | 1 - .../qtcreator/qmldesigner/effectMakerQmlSources/ValueImage.qml | 1 - share/qtcreator/qmldesigner/effectMakerQmlSources/ValueInt.qml | 1 - .../qtcreator/qmldesigner/effectMakerQmlSources/ValueVec2.qml | 1 - .../qtcreator/qmldesigner/effectMakerQmlSources/ValueVec3.qml | 1 - .../qtcreator/qmldesigner/effectMakerQmlSources/ValueVec4.qml | 1 - share/qtcreator/qmldesigner/insight/Main.qml | 1 - .../qmldesigner/itemLibraryQmlSources/AddModuleView.qml | 1 - .../qmldesigner/itemLibraryQmlSources/ItemDelegate.qml | 2 +- .../qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml | 2 +- .../materialBrowserQmlSource/ChooseMaterialProperty.qml | 1 - .../qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml | 1 - .../materialBrowserQmlSource/MaterialBrowserItemName.qml | 1 - .../qmldesigner/materialBrowserQmlSource/MaterialItem.qml | 1 - .../qmldesigner/materialBrowserQmlSource/TextureItem.qml | 1 - .../materialEditorQmlSources/EmptyMaterialEditorPane.qml | 1 - .../materialEditorQmlSources/MaterialEditorPane.qml | 1 - .../materialEditorQmlSources/MaterialEditorToolBar.qml | 1 - .../materialEditorQmlSources/MaterialEditorTopSection.qml | 1 - .../qmldesigner/propertyEditorQmlSources/QtQuick/AnchorRow.qml | 1 - .../QtQuick/Controls/AbstractButtonSection.qml | 1 - .../QtQuick/Controls/ButtonSection.qml | 1 - .../QtQuick/Controls/ButtonSpecifics.qml | 1 - .../QtQuick/Controls/ControlSpecifics.qml | 1 - .../propertyEditorQmlSources/QtQuick/QtObjectPane.qml | 1 - .../qmldesigner/propertyEditorQmlSources/QtQuick/emptyPane.qml | 3 +-- .../propertyEditorQmlSources/QtQuick3D/Object3DPane.qml | 1 - .../imports/HelperWidgets/ButtonRowButton.qml | 1 - .../imports/HelperWidgets/ColorEditor.qml | 1 - .../imports/HelperWidgets/ColorEditorPopup.qml | 1 - .../imports/HelperWidgets/ComponentSection.qml | 1 - .../imports/HelperWidgets/ExpressionTextField.qml | 1 - .../imports/HelperWidgets/ExtendedFunctionLogic.qml | 1 - .../imports/HelperWidgets/GradientPresetList.qml | 1 - .../imports/HelperWidgets/GradientPresetTabContent.qml | 1 - .../imports/HelperWidgets/IconButton.qml | 1 - .../imports/HelperWidgets/LineEdit.qml | 1 - .../imports/HelperWidgets/PropertyEditorPane.qml | 3 +-- .../imports/HelperWidgets/RoundedPanel.qml | 1 - .../propertyEditorQmlSources/imports/HelperWidgets/Section.qml | 1 - .../imports/HelperWidgets/UrlChooser.qml | 1 - .../imports/StudioControls/ColorEditor.qml | 1 - .../imports/StudioControls/SearchBox.qml | 1 - .../imports/StudioControls/TopLevelComboBox.qml | 1 - .../imports/StudioControls/impl/ColorEditorPopup.qml | 1 - .../propertyEditorQmlSources/imports/StudioTheme/Values.qml | 2 +- .../textureEditorQmlSource/EmptyTextureEditorPane.qml | 1 - .../qmldesigner/textureEditorQmlSource/TextureEditorPane.qml | 1 - .../textureEditorQmlSource/TextureEditorToolBar.qml | 1 - share/qtcreator/qmldesigner/toolbar/Main.qml | 1 - 71 files changed, 5 insertions(+), 73 deletions(-) diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionView.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionView.qml index 32f71cc231b..29203f571c3 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionView.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionView.qml @@ -4,7 +4,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 as HelperWidgets import StudioTheme 1.0 as StudioTheme import CollectionEditorBackend diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/ImportDialog.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/ImportDialog.qml index e7bcefff776..67bcb8c5721 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/ImportDialog.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/ImportDialog.qml @@ -4,7 +4,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import QtQuickDesignerTheme 1.0 import Qt.labs.platform as PlatformWidgets import HelperWidgets 2.0 as HelperWidgets import StudioControls 1.0 as StudioControls diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/NewCollectionDialog.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/NewCollectionDialog.qml index 5cac7fd3fc0..a75842bbd03 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/NewCollectionDialog.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/NewCollectionDialog.qml @@ -4,7 +4,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import QtQuickDesignerTheme 1.0 import Qt.labs.platform as PlatformWidgets import HelperWidgets 2.0 as HelperWidgets import StudioControls 1.0 as StudioControls diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibrary.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibrary.qml index 63ac2517aed..4399e40a7b0 100644 --- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibrary.qml +++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibrary.qml @@ -4,7 +4,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import QtQuickDesignerTheme import HelperWidgets 2.0 as HelperWidgets import StudioControls 1.0 as StudioControls import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryEffect.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryEffect.qml index d418cab0dbe..71738072a24 100644 --- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryEffect.qml +++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryEffect.qml @@ -3,7 +3,6 @@ import QtQuick import QtQuick.Layouts -import QtQuickDesignerTheme import HelperWidgets import QtQuick.Controls diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterial.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterial.qml index 9160c916064..9ebfa75b217 100644 --- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterial.qml +++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryMaterial.qml @@ -4,7 +4,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import QtQuickDesignerTheme import HelperWidgets import StudioTheme as StudioTheme diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexture.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexture.qml index 74ece1c015b..94390969f65 100644 --- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexture.qml +++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/ContentLibraryTexture.qml @@ -4,7 +4,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import QtQuickDesignerTheme import HelperWidgets import StudioTheme as StudioTheme diff --git a/share/qtcreator/qmldesigner/contentLibraryQmlSource/UnimportBundleMaterialDialog.qml b/share/qtcreator/qmldesigner/contentLibraryQmlSource/UnimportBundleMaterialDialog.qml index edb6ce36707..48be045d8bd 100644 --- a/share/qtcreator/qmldesigner/contentLibraryQmlSource/UnimportBundleMaterialDialog.qml +++ b/share/qtcreator/qmldesigner/contentLibraryQmlSource/UnimportBundleMaterialDialog.qml @@ -4,7 +4,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import QtQuickDesignerTheme import HelperWidgets import StudioControls as StudioControls import StudioTheme as StudioTheme diff --git a/share/qtcreator/qmldesigner/edit3dQmlSource/BakeLightsProgressDialog.qml b/share/qtcreator/qmldesigner/edit3dQmlSource/BakeLightsProgressDialog.qml index 259a0a1ab59..7da6aeffb16 100644 --- a/share/qtcreator/qmldesigner/edit3dQmlSource/BakeLightsProgressDialog.qml +++ b/share/qtcreator/qmldesigner/edit3dQmlSource/BakeLightsProgressDialog.qml @@ -4,7 +4,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import QtQuickDesignerTheme import HelperWidgets import StudioControls as StudioControls import StudioTheme as StudioTheme diff --git a/share/qtcreator/qmldesigner/edit3dQmlSource/BakeLightsSetupDialog.qml b/share/qtcreator/qmldesigner/edit3dQmlSource/BakeLightsSetupDialog.qml index 5c202a4a60b..7366bef8c1c 100644 --- a/share/qtcreator/qmldesigner/edit3dQmlSource/BakeLightsSetupDialog.qml +++ b/share/qtcreator/qmldesigner/edit3dQmlSource/BakeLightsSetupDialog.qml @@ -4,7 +4,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import QtQuickDesignerTheme import HelperWidgets import StudioControls as StudioControls import StudioTheme as StudioTheme diff --git a/share/qtcreator/qmldesigner/edit3dQmlSource/SnapConfigurationDialog.qml b/share/qtcreator/qmldesigner/edit3dQmlSource/SnapConfigurationDialog.qml index 43460b7f719..61551216c1b 100644 --- a/share/qtcreator/qmldesigner/edit3dQmlSource/SnapConfigurationDialog.qml +++ b/share/qtcreator/qmldesigner/edit3dQmlSource/SnapConfigurationDialog.qml @@ -4,7 +4,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import QtQuickDesignerTheme import HelperWidgets as HelperWidgets import StudioControls as StudioControls import StudioTheme as StudioTheme diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNode.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNode.qml index 2ccaeaf36c3..20a57f05b5f 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNode.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNode.qml @@ -3,7 +3,6 @@ import QtQuick import QtQuick.Controls -import QtQuickDesignerTheme import HelperWidgets as HelperWidgets import StudioControls as StudioControls import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNodeUniform.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNodeUniform.qml index d696fccc1eb..9d9098125c4 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNodeUniform.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNodeUniform.qml @@ -4,7 +4,6 @@ import QtQuick import QtQuick.Dialogs import QtQuick.Layouts -import QtQuickDesignerTheme import HelperWidgets as HelperWidgets import StudioControls as StudioControls import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMakerPreview.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMakerPreview.qml index ea0b2d12954..be7defceea5 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMakerPreview.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMakerPreview.qml @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick -import QtQuickDesignerTheme import HelperWidgets as HelperWidgets import StudioControls as StudioControls import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMakerTopBar.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMakerTopBar.qml index 9c962655e3a..fefc35a12bb 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMakerTopBar.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMakerTopBar.qml @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick -import QtQuickDesignerTheme import HelperWidgets as HelperWidgets import StudioControls as StudioControls import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectNode.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectNode.qml index f3fca1ccec7..df90538c928 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectNode.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectNode.qml @@ -3,7 +3,6 @@ import QtQuick import QtQuick.Controls -import QtQuickDesignerTheme import HelperWidgets import StudioControls as StudioControls import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectNodesComboBox.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectNodesComboBox.qml index a2187d4aba7..ac3ca557271 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectNodesComboBox.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectNodesComboBox.qml @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick -import QtQuickDesignerTheme import HelperWidgets as HelperWidgets import StudioControls as StudioControls import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/PreviewImagesComboBox.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/PreviewImagesComboBox.qml index feadaa1d940..6702b3498b5 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/PreviewImagesComboBox.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/PreviewImagesComboBox.qml @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick -import QtQuickDesignerTheme import HelperWidgets as HelperWidgets import StudioControls as StudioControls import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueBool.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueBool.qml index 201f9976989..c9e1c35ff10 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueBool.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueBool.qml @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick -import QtQuickDesignerTheme import StudioControls as StudioControls import StudioTheme 1.0 as StudioTheme import EffectMakerBackend diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueColor.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueColor.qml index 1f601f90639..8391182f9c9 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueColor.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueColor.qml @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick -import QtQuickDesignerTheme import StudioControls as StudioControls import StudioTheme 1.0 as StudioTheme import EffectMakerBackend diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueDefine.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueDefine.qml index d5a6cf139a1..d5f2d42393a 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueDefine.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueDefine.qml @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick -import QtQuickDesignerTheme import StudioControls as StudioControls import StudioTheme 1.0 as StudioTheme import EffectMakerBackend diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueFloat.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueFloat.qml index 9c2d2c80a23..835ab1c6a40 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueFloat.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueFloat.qml @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick -import QtQuickDesignerTheme import StudioControls as StudioControls import StudioTheme 1.0 as StudioTheme import EffectMakerBackend diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueImage.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueImage.qml index 832350ef177..77f90fc4b0c 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueImage.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueImage.qml @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick -import QtQuickDesignerTheme import HelperWidgets as HelperWidgets import StudioTheme 1.0 as StudioTheme import EffectMakerBackend diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueInt.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueInt.qml index b5db8db05e8..87559dd3341 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueInt.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueInt.qml @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick -import QtQuickDesignerTheme import StudioControls as StudioControls import StudioTheme 1.0 as StudioTheme import EffectMakerBackend diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueVec2.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueVec2.qml index 9207e98a621..719dfdcfc12 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueVec2.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueVec2.qml @@ -3,7 +3,6 @@ import QtQuick import QtQuick.Layouts -import QtQuickDesignerTheme import StudioControls as StudioControls import StudioTheme 1.0 as StudioTheme import EffectMakerBackend diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueVec3.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueVec3.qml index 52df4c999a6..214ef783fba 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueVec3.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueVec3.qml @@ -3,7 +3,6 @@ import QtQuick import QtQuick.Layouts -import QtQuickDesignerTheme import StudioControls as StudioControls import StudioTheme 1.0 as StudioTheme import EffectMakerBackend diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueVec4.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueVec4.qml index 05954e5b65c..adf7d1721bb 100644 --- a/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueVec4.qml +++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/ValueVec4.qml @@ -3,7 +3,6 @@ import QtQuick import QtQuick.Layouts -import QtQuickDesignerTheme import StudioControls as StudioControls import StudioTheme 1.0 as StudioTheme import EffectMakerBackend diff --git a/share/qtcreator/qmldesigner/insight/Main.qml b/share/qtcreator/qmldesigner/insight/Main.qml index 14a69ce80f4..767b39b7d8d 100644 --- a/share/qtcreator/qmldesigner/insight/Main.qml +++ b/share/qtcreator/qmldesigner/insight/Main.qml @@ -3,7 +3,6 @@ import QtQuick import QtQuick.Controls -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 as HelperWidgets import StudioControls 1.0 as StudioControls import StudioTheme as StudioTheme diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/AddModuleView.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/AddModuleView.qml index 6ed7052b8e5..a2f937685f5 100644 --- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/AddModuleView.qml +++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/AddModuleView.qml @@ -3,7 +3,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 import StudioTheme 1.0 as StudioTheme import ItemLibraryBackend diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml index 1178de4a87f..0df9be8b0eb 100644 --- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml +++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml @@ -3,10 +3,10 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 import StudioTheme 1.0 as StudioTheme import ItemLibraryBackend +import QtQuickDesignerTheme Item { id: delegateRoot diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml index cf5049d6473..016f3fbbecf 100644 --- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml +++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemsView.qml @@ -2,11 +2,11 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick import QtQuick.Layouts -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 as HelperWidgets import StudioControls 1.0 as StudioControls import StudioTheme 1.0 as StudioTheme import ItemLibraryBackend +import QtQuickDesignerTheme /* The view displaying the item grid. The following Qml context properties have to be set: - ItemLibraryModel itemLibraryModel diff --git a/share/qtcreator/qmldesigner/materialBrowserQmlSource/ChooseMaterialProperty.qml b/share/qtcreator/qmldesigner/materialBrowserQmlSource/ChooseMaterialProperty.qml index ddbdbfa7c87..770cde48c9e 100644 --- a/share/qtcreator/qmldesigner/materialBrowserQmlSource/ChooseMaterialProperty.qml +++ b/share/qtcreator/qmldesigner/materialBrowserQmlSource/ChooseMaterialProperty.qml @@ -4,7 +4,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import QtQuickDesignerTheme import HelperWidgets import StudioControls as StudioControls import StudioTheme as StudioTheme diff --git a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml index e0dacef36be..ab4904cfc77 100644 --- a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml +++ b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 as HelperWidgets import StudioControls 1.0 as StudioControls import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowserItemName.qml b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowserItemName.qml index 800217bac55..179ebc64c47 100644 --- a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowserItemName.qml +++ b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowserItemName.qml @@ -3,7 +3,6 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 import StudioTheme 1.0 as StudioTheme import MaterialBrowserBackend diff --git a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialItem.qml b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialItem.qml index ce1b12aeaeb..a74f422ac1d 100644 --- a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialItem.qml +++ b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialItem.qml @@ -3,7 +3,6 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 import StudioTheme 1.0 as StudioTheme import MaterialBrowserBackend diff --git a/share/qtcreator/qmldesigner/materialBrowserQmlSource/TextureItem.qml b/share/qtcreator/qmldesigner/materialBrowserQmlSource/TextureItem.qml index 4eaa449c62a..5ed132461b3 100644 --- a/share/qtcreator/qmldesigner/materialBrowserQmlSource/TextureItem.qml +++ b/share/qtcreator/qmldesigner/materialBrowserQmlSource/TextureItem.qml @@ -4,7 +4,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import QtQuickDesignerTheme import HelperWidgets import StudioTheme as StudioTheme import MaterialBrowserBackend diff --git a/share/qtcreator/qmldesigner/materialEditorQmlSources/EmptyMaterialEditorPane.qml b/share/qtcreator/qmldesigner/materialEditorQmlSources/EmptyMaterialEditorPane.qml index 39b0929a442..421a09a375e 100644 --- a/share/qtcreator/qmldesigner/materialEditorQmlSources/EmptyMaterialEditorPane.qml +++ b/share/qtcreator/qmldesigner/materialEditorQmlSources/EmptyMaterialEditorPane.qml @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/materialEditorQmlSources/MaterialEditorPane.qml b/share/qtcreator/qmldesigner/materialEditorQmlSources/MaterialEditorPane.qml index 0187cde6951..1c9264081aa 100644 --- a/share/qtcreator/qmldesigner/materialEditorQmlSources/MaterialEditorPane.qml +++ b/share/qtcreator/qmldesigner/materialEditorQmlSources/MaterialEditorPane.qml @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 PropertyEditorPane { diff --git a/share/qtcreator/qmldesigner/materialEditorQmlSources/MaterialEditorToolBar.qml b/share/qtcreator/qmldesigner/materialEditorQmlSources/MaterialEditorToolBar.qml index d5a9acf974b..1dcbe98b0f8 100644 --- a/share/qtcreator/qmldesigner/materialEditorQmlSources/MaterialEditorToolBar.qml +++ b/share/qtcreator/qmldesigner/materialEditorQmlSources/MaterialEditorToolBar.qml @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 as HelperWidgets import StudioControls 1.0 as StudioControls import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/materialEditorQmlSources/MaterialEditorTopSection.qml b/share/qtcreator/qmldesigner/materialEditorQmlSources/MaterialEditorTopSection.qml index dbc023d83b2..0148d80def3 100644 --- a/share/qtcreator/qmldesigner/materialEditorQmlSources/MaterialEditorTopSection.qml +++ b/share/qtcreator/qmldesigner/materialEditorQmlSources/MaterialEditorTopSection.qml @@ -4,7 +4,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 as HelperWidgets import StudioControls 1.0 as StudioControls import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnchorRow.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnchorRow.qml index a6c57a73ede..4afaf98da02 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnchorRow.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnchorRow.qml @@ -4,7 +4,6 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 import HelperWidgets 2.0 -import QtQuickDesignerTheme 1.0 import StudioControls 1.0 as StudioControls import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/AbstractButtonSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/AbstractButtonSection.qml index e625e5c8420..403d08d0281 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/AbstractButtonSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/AbstractButtonSection.qml @@ -4,7 +4,6 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 import HelperWidgets 2.0 -import QtQuickDesignerTheme 1.0 import StudioTheme 1.0 as StudioTheme Section { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ButtonSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ButtonSection.qml index dbfbfd1fd46..28cb0d6aea9 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ButtonSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ButtonSection.qml @@ -4,7 +4,6 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 import HelperWidgets 2.0 -import QtQuickDesignerTheme 1.0 import StudioTheme 1.0 as StudioTheme Section { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ButtonSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ButtonSpecifics.qml index ab22345980f..984c69795e2 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ButtonSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ButtonSpecifics.qml @@ -4,7 +4,6 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 import HelperWidgets 2.0 -import QtQuickDesignerTheme 1.0 import StudioTheme 1.0 as StudioTheme Column { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ControlSpecifics.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ControlSpecifics.qml index 687053b3246..a99ee36ca7e 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ControlSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ControlSpecifics.qml @@ -4,7 +4,6 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 import HelperWidgets 2.0 -import QtQuickDesignerTheme 1.0 import StudioTheme 1.0 as StudioTheme Column { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/QtObjectPane.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/QtObjectPane.qml index 92e157dfdc4..7e6a8095da6 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/QtObjectPane.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/QtObjectPane.qml @@ -3,7 +3,6 @@ import QtQuick import QtQuick.Layouts -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/emptyPane.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/emptyPane.qml index a5dc28f6f86..9af9f81d401 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/emptyPane.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/emptyPane.qml @@ -5,14 +5,13 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 as Controls import QtQuick.Layouts 1.15 import HelperWidgets 2.0 -import QtQuickDesignerTheme 1.0 import StudioTheme 1.0 as StudioTheme Rectangle { id: itemPane width: 320 height: 400 - color: Theme.qmlDesignerBackgroundColorDarkAlternate() + color: StudioTheme.Values.themePanelBackground ColumnLayout { id: mainColumn diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick3D/Object3DPane.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick3D/Object3DPane.qml index c532281d6f5..473d847594a 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick3D/Object3DPane.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick3D/Object3DPane.qml @@ -3,7 +3,6 @@ import QtQuick import QtQuick.Layouts -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ButtonRowButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ButtonRowButton.qml index 3d4373cdf06..df0392fd0c6 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ButtonRowButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ButtonRowButton.qml @@ -3,7 +3,6 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 -import QtQuickDesignerTheme 1.0 import StudioTheme 1.0 as StudioTheme Item { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml index 88624471627..f9e72ad67da 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml @@ -7,7 +7,6 @@ import QtQuick.Shapes import QtQuick.Templates as T import StudioTheme as StudioTheme import StudioControls as StudioControls -import QtQuickDesignerTheme import QtQuickDesignerColorPalette SecondColumnLayout { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml index 9e2fecc6771..0591d1cb5a2 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml @@ -5,7 +5,6 @@ import QtQuick import QtQuick.Layouts import QtQuick.Shapes import QtQuick.Templates as T -import QtQuickDesignerTheme import StudioTheme as StudioTheme import StudioControls as StudioControls import QtQuickDesignerColorPalette diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComponentSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComponentSection.qml index 49809cb9d97..fbff92be810 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComponentSection.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComponentSection.qml @@ -4,7 +4,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 -import QtQuickDesignerTheme 1.0 import QtQuick.Templates 2.15 as T import HelperWidgets 2.0 import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExpressionTextField.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExpressionTextField.qml index b968768043a..a9c7d46afe9 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExpressionTextField.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExpressionTextField.qml @@ -4,7 +4,6 @@ import QtQuick 2.15 import QtQuick.Window 2.15 import QtQuick.Controls 2.15 -import QtQuickDesignerTheme 1.0 import StudioControls 1.0 as StudioControls import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExtendedFunctionLogic.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExtendedFunctionLogic.qml index c82aa2cea5f..d20290df17d 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExtendedFunctionLogic.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExtendedFunctionLogic.qml @@ -4,7 +4,6 @@ import QtQuick 2.15 import StudioControls 1.0 as StudioControls import StudioTheme 1.0 as StudioTheme -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 Item { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPresetList.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPresetList.qml index 6af54c11b98..2503d35103a 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPresetList.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPresetList.qml @@ -4,7 +4,6 @@ import QtQuick import QtQuick.Layouts import Qt.labs.platform -import QtQuickDesignerTheme import HelperWidgets import StudioControls as StudioControls import StudioTheme as StudioTheme diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPresetTabContent.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPresetTabContent.qml index 050fb64f488..e7c192adbd7 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPresetTabContent.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPresetTabContent.qml @@ -4,7 +4,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 import StudioControls 1.0 as StudioControls import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/IconButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/IconButton.qml index 4852b05a98a..69181b28133 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/IconButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/IconButton.qml @@ -3,7 +3,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import QtQuickDesignerTheme 1.0 import StudioTheme 1.0 as StudioTheme Rectangle { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml index dffe3d779ea..57e733d9a3d 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml @@ -4,7 +4,6 @@ import QtQuick 2.15 import StudioControls 1.0 as StudioControls import StudioTheme 1.0 as StudioTheme -import QtQuickDesignerTheme 1.0 StudioControls.TextField { id: lineEdit diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/PropertyEditorPane.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/PropertyEditorPane.qml index 26151ec9165..8d51147b86b 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/PropertyEditorPane.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/PropertyEditorPane.qml @@ -4,7 +4,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 as HelperWidgets import StudioTheme 1.0 as StudioTheme @@ -13,7 +12,7 @@ Rectangle { width: 320 height: 400 - color: Theme.qmlDesignerBackgroundColorDarkAlternate() + color: StudioTheme.Values.themePanelBackground Component.onCompleted: Controller.mainScrollView = mainScrollView diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/RoundedPanel.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/RoundedPanel.qml index 5cfd1076bf3..eec3611defe 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/RoundedPanel.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/RoundedPanel.qml @@ -3,7 +3,6 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 -import QtQuickDesignerTheme 1.0 import StudioTheme 1.0 as StudioTheme Rectangle { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml index 5eb40e42cc5..edba2b1f25d 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml @@ -4,7 +4,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 as Controls import QtQuick.Layouts 1.15 -import QtQuickDesignerTheme 1.0 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 3b00a30a1fc..16d74c66f07 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/UrlChooser.qml @@ -7,7 +7,6 @@ import QtQuick.Controls import HelperWidgets import StudioControls as StudioControls import StudioTheme as StudioTheme -import QtQuickDesignerTheme Row { id: root diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ColorEditor.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ColorEditor.qml index 458cceb31e1..9069370e9c9 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ColorEditor.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ColorEditor.qml @@ -3,7 +3,6 @@ import QtQuick import StudioTheme as StudioTheme -import QtQuickDesignerTheme import QtQuickDesignerColorPalette import StudioHelpers diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SearchBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SearchBox.qml index d885271ecb7..cb3805954cb 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SearchBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SearchBox.qml @@ -3,7 +3,6 @@ import QtQuick import QtQuick.Templates as T -import QtQuickDesignerTheme 1.0 import StudioTheme 1.0 as StudioTheme T.TextField { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TopLevelComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TopLevelComboBox.qml index 3aa5d709402..27f8333d246 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TopLevelComboBox.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TopLevelComboBox.qml @@ -4,7 +4,6 @@ import QtQuick import QtQuick.Templates as T import StudioTheme as StudioTheme -import QtQuickDesignerTheme import StudioWindowManager T.ComboBox { diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/impl/ColorEditorPopup.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/impl/ColorEditorPopup.qml index ba37645239f..4f46b356f3a 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/impl/ColorEditorPopup.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/impl/ColorEditorPopup.qml @@ -5,7 +5,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import QtQuick.Templates as T -import QtQuickDesignerTheme import StudioControls as StudioControls import StudioTheme as StudioTheme import QtQuickDesignerColorPalette diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml index 6b179e42298..6b2e6b75cbb 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml @@ -3,7 +3,7 @@ pragma Singleton import QtQuick -import QtQuickDesignerTheme 1.0 +import QtQuickDesignerTheme QtObject { id: values diff --git a/share/qtcreator/qmldesigner/textureEditorQmlSource/EmptyTextureEditorPane.qml b/share/qtcreator/qmldesigner/textureEditorQmlSource/EmptyTextureEditorPane.qml index 244f3beb83d..5405e6d34cd 100644 --- a/share/qtcreator/qmldesigner/textureEditorQmlSource/EmptyTextureEditorPane.qml +++ b/share/qtcreator/qmldesigner/textureEditorQmlSource/EmptyTextureEditorPane.qml @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 import StudioTheme 1.0 as StudioTheme diff --git a/share/qtcreator/qmldesigner/textureEditorQmlSource/TextureEditorPane.qml b/share/qtcreator/qmldesigner/textureEditorQmlSource/TextureEditorPane.qml index ddf452d6f0f..18801aabdb9 100644 --- a/share/qtcreator/qmldesigner/textureEditorQmlSource/TextureEditorPane.qml +++ b/share/qtcreator/qmldesigner/textureEditorQmlSource/TextureEditorPane.qml @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 PropertyEditorPane { diff --git a/share/qtcreator/qmldesigner/textureEditorQmlSource/TextureEditorToolBar.qml b/share/qtcreator/qmldesigner/textureEditorQmlSource/TextureEditorToolBar.qml index 6a61a76ef60..1e187a95dd8 100644 --- a/share/qtcreator/qmldesigner/textureEditorQmlSource/TextureEditorToolBar.qml +++ b/share/qtcreator/qmldesigner/textureEditorQmlSource/TextureEditorToolBar.qml @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick -import QtQuickDesignerTheme 1.0 import HelperWidgets 2.0 as HelperWidgets import StudioTheme 1.0 as StudioTheme import TextureToolBarAction 1.0 diff --git a/share/qtcreator/qmldesigner/toolbar/Main.qml b/share/qtcreator/qmldesigner/toolbar/Main.qml index 63b3aef5653..d173bfc2eb6 100644 --- a/share/qtcreator/qmldesigner/toolbar/Main.qml +++ b/share/qtcreator/qmldesigner/toolbar/Main.qml @@ -5,7 +5,6 @@ import QtQuick import QtQuick.Controls import StudioControls 1.0 as StudioControls import StudioTheme 1.0 as StudioTheme -import QtQuickDesignerTheme 1.0 import ToolBar 1.0