QmlDesigner: Remove programmatical derivation of theme colors

The Qt Quick Designer synthesized a few theme colors from existing theme
colors. That was in order to prevent the need for 6 theme colors being
defined in every theme. It turned out, however, that being able to
define these if favorable.

Todo in follow-up commit: remove QmlDesigner::Theme::qmlDesigner...()
functions, and fix up the qml, accordingly.

Change-Id: Ica85df5472cd7b9da8bf215eb6dbdcf608a4fb2d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

4 files changed, 24 insertions, 24 deletions

diff --git a/src/plugins/qmldesigner/components/resources/centerwidget.css b/src/plugins/qmldesigner/components/resources/centerwidget.css
index 0b1e633141f..9ca0b84a185 100644
--- a/src/plugins/qmldesigner/components/resources/centerwidget.css
+++ b/src/plugins/qmldesigner/components/resources/centerwidget.css
@@ -1,8 +1,8 @@
 QWidget#centralTabBar {
-    background-color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate;
+    background-color: creatorTheme.QmlDesigner_BackgroundColorDarkAlternate;
 }
 QWidget#tabBarBackground {
-    background-color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate;
+    background-color: creatorTheme.QmlDesigner_BackgroundColorDarkAlternate;
 }
 
 QTabBar#centralTabBar::tab:first {
@@ -10,8 +10,8 @@ QTabBar#centralTabBar::tab:first {
     height: 0px;
 }
 QTabBar#centralTabBar::tab {
-    background-color: creatorTheme.QmlDesignerTabDark;
-    color: creatorTheme.QmlDesignerTabLight;
+    background-color: creatorTheme.QmlDesigner_TabDark;
+    color: creatorTheme.QmlDesigner_TabLight;
 
     width: 11px;
     height: 100px;
@@ -24,12 +24,12 @@ QTabBar#centralTabBar::tab {
 }
 
 QTabBar#centralTabBar::tab:selected {
-    background-color: creatorTheme.QmlDesignerTabLight;
-    color: creatorTheme.QmlDesignerTabDark;
+    background-color: creatorTheme.QmlDesigner_TabLight;
+    color: creatorTheme.QmlDesigner_TabDark;
 }
 
 QToolButton#centralTabBar {
-    background-color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate;
+    background-color: creatorTheme.QmlDesigner_BackgroundColorDarkAlternate;
     width: 08px;
     height: 16px;
     border: none;
diff --git a/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css b/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css
index 1ab3cf047f3..5f0cb0ecc60 100644
--- a/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css
+++ b/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css
@@ -1,23 +1,23 @@
 
 QStackedWidget {
     border: 0px;
-    background-color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate;
+    background-color: creatorTheme.QmlDesigner_BackgroundColorDarkAlternate;
 }
 
 QGraphicsView {
     padding: 2px;
     border: 0px;
-    background-color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate;
+    background-color: creatorTheme.QmlDesigner_BackgroundColorDarkAlternate;
 }
 
 QGraphicsView:focus {
-    background-color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate;
+    background-color: creatorTheme.QmlDesigner_BackgroundColorDarkAlternate;
 }
 
 QLineEdit
 {
     color: creatorTheme.PanelTextColorLight;
-    border: 1px solid creatorTheme.QmlDesignerBackgroundColorDarker;
+    border: 1px solid creatorTheme.QmlDesigner_BackgroundColorDarker;
     padding: 2px 8px;
     margin: 2px;
     background-color: creatorTheme.FancyToolButtonSelectedColor;
diff --git a/src/plugins/qmldesigner/components/resources/scrollbar.css b/src/plugins/qmldesigner/components/resources/scrollbar.css
index ac07d960275..d019d225ea7 100644
--- a/src/plugins/qmldesigner/components/resources/scrollbar.css
+++ b/src/plugins/qmldesigner/components/resources/scrollbar.css
@@ -11,7 +11,7 @@ QScrollBar:horizontal {
 }
 
 QScrollBar::handle {
-    background-color: creatorTheme.QmlDesignerButtonColor;
+    background-color: creatorTheme.QmlDesigner_ButtonColor;
 }
 
 QScrollBar::handle:vertical {
diff --git a/src/plugins/qmldesigner/components/resources/stylesheet.css b/src/plugins/qmldesigner/components/resources/stylesheet.css
index 2992e0e7fa2..c2a180599fa 100644
--- a/src/plugins/qmldesigner/components/resources/stylesheet.css
+++ b/src/plugins/qmldesigner/components/resources/stylesheet.css
@@ -1,6 +1,6 @@
 QFrame {
    border: 2px;
-   background-color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate;
+   background-color: creatorTheme.QmlDesigner_BackgroundColorDarkAlternate;
 }
 
 QLabel {
@@ -13,24 +13,24 @@ QLabel {
 
 QScrollArea {
      border: 0px;
-     background-color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate;
+     background-color: creatorTheme.QmlDesigner_BackgroundColorDarkAlternate;
 }
 
 QStackedWidget {
      border: 0px;
-     background-color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate;
+     background-color: creatorTheme.QmlDesigner_BackgroundColorDarkAlternate;
 }
 
 QGraphicsView {
      border: 0px;
-     background-color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate;
+     background-color: creatorTheme.QmlDesigner_BackgroundColorDarkAlternate;
 }
 
 QLineEdit#itemLibrarySearchInput
 {
     color: creatorTheme.PanelTextColorLight;
     font-size: 11px;
-    border: 1px solid creatorTheme.QmlDesignerBackgroundColorDarker;
+    border: 1px solid creatorTheme.QmlDesigner_BackgroundColorDarker;
     border-width: 1;
     max-height: 20px;
     min-height: 20px;
@@ -61,12 +61,12 @@ QLineEdit#itemLibrarySearchInput
 
 QTabWidget {
      border: 0px;
-     background-color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate;
+     background-color: creatorTheme.QmlDesigner_BackgroundColorDarkAlternate;
 }
 
 QTabWidget::pane { /* The tab widget frame */
      border: 0px;
-     background-color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate;
+     background-color: creatorTheme.QmlDesigner_BackgroundColorDarkAlternate;
 }
 
 QTabBar::tab {
@@ -74,8 +74,8 @@ QTabBar::tab {
     height: 22px;
 
     border-image: none;
-    background-color: creatorTheme.QmlDesignerTabDark;
-    color: creatorTheme.QmlDesignerTabLight;
+    background-color: creatorTheme.QmlDesigner_TabDark;
+    color: creatorTheme.QmlDesigner_TabLight;
 
     margin-top: 0x;
     margin-bottom: 0px;
@@ -87,10 +87,10 @@ QTabBar::tab {
 
 QTabBar::tab:selected {
     border: none; /* no border for a flat push button */
-    background-color: creatorTheme.QmlDesignerTabLight;
-    color: creatorTheme.QmlDesignerTabDark;
+    background-color: creatorTheme.QmlDesigner_TabLight;
+    color: creatorTheme.QmlDesigner_TabDark;
 }
 
 QWidget#itemLibrarySearchInputSpacer {
-    background-color: creatorTheme.QmlDesignerTabLight;
+    background-color: creatorTheme.QmlDesigner_TabLight;
 }