From dc6a3c4feffb74b1334959a3d77e5f9b70c8b3c3 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Date: Thu, 14 Jul 2016 12:22:42 +0200
Subject: [PATCH] QmlDesigner: Remove triangle icons

Change-Id: I32e0cb8a2d1b406c464ada33685def1149626a72
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/libs/qmleditorwidgets/images/triangle_horz.png | Bin 95 -> 0 bytes
 src/libs/qmleditorwidgets/images/triangle_vert.png | Bin 84 -> 0 bytes
 src/libs/qmleditorwidgets/resources.qrc            |   2 --
 .../components/navigator/navigatorwidget.cpp       |   5 +++++
 .../components/resources/stylesheet.css            |  12 ------------
 5 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100644 src/libs/qmleditorwidgets/images/triangle_horz.png
 delete mode 100644 src/libs/qmleditorwidgets/images/triangle_vert.png

diff --git a/src/libs/qmleditorwidgets/images/triangle_horz.png b/src/libs/qmleditorwidgets/images/triangle_horz.png
deleted file mode 100644
index c09fa99d39672aa715b9c001614a7a8d8817fef0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 95
zcmeAS@N?(olHy`uVBq!ia0y~yVBiE{4i*Lm2Co_CW-~A_sCl|LhHzX@PGD#%{V#dp
x;I97?O$v%8jvWGB3O*d30?V}ynJIl{u<Ox$HYsM)HU<U;22WQ%mvv4FO#m)l8pr?u

diff --git a/src/libs/qmleditorwidgets/images/triangle_vert.png b/src/libs/qmleditorwidgets/images/triangle_vert.png
deleted file mode 100644
index b85dafda5906d8a872a9791fdb5b27d84236ecf4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 84
zcmeAS@N?(olHy`uVBq!ia0y~yVBiE{4i*Lm2Co_CW-~A_NPD_ChHzX@PEg=l^ShtV
mki{@0DdV`o<VF<+hKfARXQuc5USeQiVDNPHb6Mw<&;$VRJr)oE

diff --git a/src/libs/qmleditorwidgets/resources.qrc b/src/libs/qmleditorwidgets/resources.qrc
index ca3b6e783fc..3c0b730732c 100644
--- a/src/libs/qmleditorwidgets/resources.qrc
+++ b/src/libs/qmleditorwidgets/resources.qrc
@@ -18,8 +18,6 @@
         <file>images/checkbox_tr_unchecked_pressed@2x.png</file>
         <file>images/lock.png</file>
         <file>images/hole.png</file>
-        <file>images/triangle_horz.png</file>
-        <file>images/triangle_vert.png</file>
         <file>images/scrollbar-borderimage-horizontal.png</file>
         <file>images/scrollbar-borderimage-vertical.png</file>
         <file>images/aspectlockset.png</file>
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
index 426b53cf380..f490ada0684 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
@@ -36,6 +36,8 @@
 #include <QtDebug>
 #include <utils/fileutils.h>
 
+#include <QStyleFactory>
+
 namespace QmlDesigner {
 
 NavigatorWidget::NavigatorWidget(NavigatorView *view) :
@@ -51,6 +53,9 @@ NavigatorWidget::NavigatorWidget(NavigatorView *view) :
     m_treeView->setDefaultDropAction(Qt::LinkAction);
     m_treeView->setHeaderHidden(true);
 
+    QStyle *style = QStyleFactory::create("fusion");
+    m_treeView->setStyle(style);
+
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setSpacing(0);
     layout->setMargin(0);
diff --git a/src/plugins/qmldesigner/components/resources/stylesheet.css b/src/plugins/qmldesigner/components/resources/stylesheet.css
index 366c059005c..8270ae0315a 100644
--- a/src/plugins/qmldesigner/components/resources/stylesheet.css
+++ b/src/plugins/qmldesigner/components/resources/stylesheet.css
@@ -80,18 +80,6 @@ QTreeView::branch:has-siblings:!adjoins-item {
      image:none;
  }
 
- QTreeView::branch:has-children:!has-siblings:closed,
- QTreeView::branch:closed:has-children:has-siblings {
-         border-image: none;
-         image: url(:/qmldesigner/images/triangle_horz.png);
- }
-
- QTreeView::branch:open:has-children:!has-siblings,
- QTreeView::branch:open:has-children:has-siblings  {
-         border-image: none;
-         image: url(:/qmldesigner/images/triangle_vert.png);
- }
-
  QListView {
     color:creatorTheme.PanelTextColorLight;
     selection-color: creatorTheme.PanelTextColorLight;