QmlDesigner: Remove unnecessary imports

Remove QtQuickDesignerTheme import if not needed. Task-number: QDS-11177 Change-Id: Ia72001855bb636bfc2ddf11cbb00359fbe123c90 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-01-16 12:12:52 +01:00
parent 00319468a6
commit 3ad3a5f197
71 changed files with 5 additions and 73 deletions
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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

--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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 {
--- 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
--- 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
--- 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
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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

--- 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
--- 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

--- 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 {
--- 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 {
--- 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
--- 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
--- 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

--- 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 {
--- 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
--- 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
--- 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 {
--- 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
--- 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

--- 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 {
--- 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

--- 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
--- 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

--- 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 {
--- 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 {
--- 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
--- 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
--- 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

--- 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 {
--- 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
--- 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