QmlDesigner: Fix assets library themingv5.0.0

Also define the themeUnimportedModuleColor value in the theme files.

Fixes: QDS-4935
Change-Id: I3fc0b2316ebc1b11e4de87c09e2136e768e5cbe2
Reviewed-by: Miikka Heikkinen <[email protected]>
Reviewed-by: Brook Cronin <[email protected]>
Reviewed-by: Henning Gründl <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>

10 files changed, 20 insertions, 3 deletions

diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml
index 4ed0159dd58..498c474411a 100644
--- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml
+++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml
@@ -165,7 +165,8 @@ Item {
                            (assetsView.verticalScrollBarVisible ? assetsView.verticalThickness : 0)
                     height: img.height
                     color: selectedAssets[filePath] ? StudioTheme.Values.themeInteraction
-                                                  : (mouseArea.containsMouse ? "#444444" : "transparent")
+                                                    : (mouseArea.containsMouse ? StudioTheme.Values.themeSectionHeadBackground
+                                                                               : "transparent")
 
                     Row {
                         spacing: 5
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
index 38034918fb5..09764f7baf9 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
@@ -278,7 +278,7 @@ QtObject {
     property string themeStateBackground: Theme.color(Theme.DSstateBackgroundColor)
     property string themeStatePreviewOutline: Theme.color(Theme.DSstatePreviewOutline)
 
-    property string themeUnimportedModuleColor: "#e33c2e"
+    property string themeUnimportedModuleColor: Theme.color(Theme.DSUnimportedModuleColor)
 
     // Taken out of Constants.js
     property string themeChangedStateText: Theme.color(Theme.DSchangedStateText)
diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme
index 736d517c6ef..7593a2b3875 100644
--- a/share/qtcreator/themes/dark.creatortheme
+++ b/share/qtcreator/themes/dark.creatortheme
@@ -152,6 +152,8 @@ DStoolTipBackground=ff111111
 DStoolTipOutline=ffdadada
 DStoolTipText=ffdadada
 
+DSUnimportedModuleColor=ffe33c2e
+
 ;DS controls theme END
 
 BackgroundColorAlternate=alternateBackground
diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme
index 0eb98021ba8..aeabe826906 100644
--- a/share/qtcreator/themes/default.creatortheme
+++ b/share/qtcreator/themes/default.creatortheme
@@ -143,6 +143,8 @@ DStoolTipBackground=ff111111
 DStoolTipOutline=ffdadada
 DStoolTipText=ffdadada
 
+DSUnimportedModuleColor=ffe33c2e
+
 ;DS controls theme END
 
 BackgroundColorAlternate=ff3d3d3d
diff --git a/share/qtcreator/themes/design-light.creatortheme b/share/qtcreator/themes/design-light.creatortheme
index ef1b7bcbb1b..70ee4462cb6 100644
--- a/share/qtcreator/themes/design-light.creatortheme
+++ b/share/qtcreator/themes/design-light.creatortheme
@@ -157,6 +157,8 @@ DStoolTipBackground=ff111111
 DStoolTipOutline=ffdadada
 DStoolTipText=ffdadada
 
+DSUnimportedModuleColor=ffe33c2e
+
 ;DS controls theme END
 
 BackgroundColorAlternate=alternateBackground
diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme
index f93c74914b9..b48b3720988 100644
--- a/share/qtcreator/themes/design.creatortheme
+++ b/share/qtcreator/themes/design.creatortheme
@@ -154,6 +154,8 @@ DStoolTipBackground=ff111111
 DStoolTipOutline=ffdadada
 DStoolTipText=ffdadada
 
+DSUnimportedModuleColor=ffe33c2e
+
 ;DS controls theme END
 
 BackgroundColorAlternate=alternateBackground
diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme
index aa9c150b1a5..aa0e8d2fdfb 100644
--- a/share/qtcreator/themes/flat-dark.creatortheme
+++ b/share/qtcreator/themes/flat-dark.creatortheme
@@ -156,6 +156,8 @@ DStoolTipBackground=ff111111
 DStoolTipOutline=ffdadada
 DStoolTipText=ffdadada
 
+DSUnimportedModuleColor=ffe33c2e
+
 ;DS controls theme END
 
 BackgroundColorAlternate=alternateBackground
diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme
index 1fa9747d3a3..b98478d134d 100644
--- a/share/qtcreator/themes/flat-light.creatortheme
+++ b/share/qtcreator/themes/flat-light.creatortheme
@@ -152,6 +152,8 @@ DStoolTipBackground=ff111111
 DStoolTipOutline=ffdadada
 DStoolTipText=ffdadada
 
+DSUnimportedModuleColor=ffe33c2e
+
 ;DS controls theme END
 
 BackgroundColorAlternate=alternateBackground
diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme
index 25a582d17ec..b6c8f09d9e4 100644
--- a/share/qtcreator/themes/flat.creatortheme
+++ b/share/qtcreator/themes/flat.creatortheme
@@ -150,6 +150,8 @@ DStoolTipBackground=ff111111
 DStoolTipOutline=ffdadada
 DStoolTipText=ffdadada
 
+DSUnimportedModuleColor=ffe33c2e
+
 ;DS controls theme END
 
 BackgroundColorAlternate=alternateBackground
diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h
index dd8735c4029..66d2d291aba 100644
--- a/src/libs/utils/theme/theme.h
+++ b/src/libs/utils/theme/theme.h
@@ -417,7 +417,9 @@ public:
 
         DStoolTipBackground,
         DStoolTipOutline,
-        DStoolTipText
+        DStoolTipText,
+
+        DSUnimportedModuleColor
     };
 
     enum Gradient {