From cdcdde4dc153dd6794fb4a73beed676993ddb0f3 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Date: Wed, 13 Jul 2016 15:10:27 +0200
Subject: [PATCH] QmlDesigner: Remove outputpane-style.css

There is no need to style the ouputpane apart from
the scrollbar.

Change-Id: I3dcd98e403dace1de243c0254408c353ebcb3db2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 .../components/resources/outputpane-style.css | 58 -------------------
 .../components/resources/resources.qrc        |  1 -
 .../styledoutputpaneplaceholder.cpp           |  6 +-
 3 files changed, 3 insertions(+), 62 deletions(-)
 delete mode 100644 src/plugins/qmldesigner/components/resources/outputpane-style.css

diff --git a/src/plugins/qmldesigner/components/resources/outputpane-style.css b/src/plugins/qmldesigner/components/resources/outputpane-style.css
deleted file mode 100644
index 6a104c1d684..00000000000
--- a/src/plugins/qmldesigner/components/resources/outputpane-style.css
+++ /dev/null
@@ -1,58 +0,0 @@
-QWidget {
-    background-color: #363636;
-    border: none;
-}
-
-QTabWidget::pane {
-    background-color: #363636;
-    border: none;
-}
-
-QAbstractScrollArea {
-    background-color: #363636;
-    border: none;
-}
-
-QPlainTextEdit {
-    background-color: #ababab;
-    border: none;
-}
-
-QTabBar {
-    font: bold;
-}
-
-QTabBar::tab {
-    border-image: none;
-
-    border-top: 1px solid #000000;
-    border-left: 1px solid #000000;
-    border-right: 1px solid #000000;
-
-    min-width: 80px;
-
-    height: 22px;
-    margin-top: 2px;
-    margin-bottom: -1px;
-    padding-left: 2px;
-    padding-right: 4px;
-
-    font-size: 11px;
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-    stop: 0 #3c3c3c, stop: 1 #444444);
-
-    color: #ababab;
-}
-
-QTabBar::tab:hover {
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-    stop: 0 #3c3c3c, stop: 1 #666666);
-}
-
-QTabBar::tab:selected {
-    border: none;
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-    stop: 0 #EEEEEE, stop: 1 #ababab);
-    color: #3c3c3c;
-}
-
diff --git a/src/plugins/qmldesigner/components/resources/resources.qrc b/src/plugins/qmldesigner/components/resources/resources.qrc
index e395cccde4f..8adecdd5db1 100644
--- a/src/plugins/qmldesigner/components/resources/resources.qrc
+++ b/src/plugins/qmldesigner/components/resources/resources.qrc
@@ -4,6 +4,5 @@
         <file>stylesheet.css</file>
         <file>scrollbar.css</file>
         <file>formeditorstylesheet.css</file>
-        <file>outputpane-style.css</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/qmldesigner/styledoutputpaneplaceholder.cpp b/src/plugins/qmldesigner/styledoutputpaneplaceholder.cpp
index 5ea75c82366..b8793740fbe 100644
--- a/src/plugins/qmldesigner/styledoutputpaneplaceholder.cpp
+++ b/src/plugins/qmldesigner/styledoutputpaneplaceholder.cpp
@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "styledoutputpaneplaceholder.h"
+#include "theming.h"
 
 #include <utils/fileutils.h>
 
@@ -36,9 +37,8 @@ namespace Internal {
 StyledOutputpanePlaceHolder::StyledOutputpanePlaceHolder(Core::Id mode, QSplitter *parent)
     : Core::OutputPanePlaceHolder(mode, parent)
 {
-    QByteArray sheet = Utils::FileReader::fetchQrc(":/qmldesigner/outputpane-style.css");
-    sheet += Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css");
-    m_customStylesheet = QString::fromUtf8(sheet);
+    QByteArray sheet = Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css");
+    m_customStylesheet = Theming::replaceCssColors(QString::fromUtf8(sheet));
 }
 
 void StyledOutputpanePlaceHolder::childEvent(QChildEvent *event)