From 4ce49bbfdedc889521799f97952653a423fdd6f8 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Mon, 9 Mar 2020 19:09:13 +0100
Subject: [PATCH] QmlDesigner: Add toolbar back to ConnectionView

Setting the fusion style only on the stack widget to keep the toolbar style.

Change-Id: I33b8256f894fa417a8729b8cdebb19a3128f1fde
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../connectioneditor/connectionviewwidget.cpp        |  7 ++++++-
 .../connectioneditor/connectionviewwidget.ui         | 12 ++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp b/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp
index 30aaf2b0045..ae4532f1f13 100644
--- a/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp
+++ b/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp
@@ -85,7 +85,7 @@ ConnectionViewWidget::ConnectionViewWidget(QWidget *parent) :
     ui->setupUi(this);
 
     QStyle *style = QStyleFactory::create("fusion");
-    setStyle(style);
+    ui->stackedWidget->setStyle(style);
 
     //ui->tabWidget->tabBar()->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
@@ -96,6 +96,11 @@ ConnectionViewWidget::ConnectionViewWidget(QWidget *parent) :
     ui->tabBar->addTab(tr("Bindings", "Title of connection view"));
     ui->tabBar->addTab(tr("Properties", "Title of dynamic properties view"));
 
+    const QList<QToolButton*> buttons = createToolBarWidgets();
+
+    for (auto toolButton : buttons)
+        ui->toolBar->addWidget(toolButton);
+
     auto settings = QmlDesignerPlugin::instance()->settings();
 
     if (!settings.value(DesignerSettingsKey::STANDALONE_MODE).toBool())
diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.ui b/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.ui
index 18df078ec6b..1828811abf4 100644
--- a/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.ui
+++ b/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.ui
@@ -29,6 +29,9 @@
    <property name="spacing">
     <number>0</number>
    </property>
+   <item row="0" column="0">
+    <widget class="QTabBar" name="tabBar" native="true"/>
+   </item>
    <item row="1" column="0">
     <widget class="QWidget" name="widgetSpacer" native="true">
      <property name="sizePolicy">
@@ -51,10 +54,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QTabBar" name="tabBar" native="true"/>
-   </item>
-   <item row="2" column="0">
+   <item row="3" column="0">
     <widget class="QStackedWidget" name="stackedWidget">
      <property name="currentIndex">
       <number>3</number>
@@ -255,10 +255,14 @@
      </widget>
     </widget>
    </item>
+   <item row="2" column="0">
+    <widget class="QToolBar" name="toolBar" native="true"/>
+   </item>
   </layout>
   <zorder>stackedWidget</zorder>
   <zorder>tabBar</zorder>
   <zorder>widgetSpacer</zorder>
+  <zorder>toolBar</zorder>
  </widget>
  <customwidgets>
   <customwidget>