[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [minuet] src: Don't use toolbars
From:       Sandro S. Andrade <sandroandrade () kde ! org>
Date:       2016-01-15 0:15:50
Message-ID: E1aJs3S-0002KX-BJ () scm ! kde ! org
[Download RAW message or body]

Git commit 1a9a5ea68f840636cc90aef1bd3662ce116e8132 by Sandro S. Andrade.
Committed on 15/01/2016 at 00:15.
Pushed by sandroandrade into branch 'master'.

Don't use toolbars

M  +4    -1    src/minuet.cpp
M  +2    -0    src/minuetui.rc

http://commits.kde.org/minuet/1a9a5ea68f840636cc90aef1bd3662ce116e8132

diff --git a/src/minuet.cpp b/src/minuet.cpp
index a4562f0..a7d7d9e 100644
--- a/src/minuet.cpp
+++ b/src/minuet.cpp
@@ -36,6 +36,7 @@
 
 #include <QtQuick/QQuickView>
 
+#include <QtWidgets/QToolBar>
 #include <QtWidgets/QMessageBox>
 
 Minuet::Minuet() :
@@ -66,7 +67,9 @@ Minuet::Minuet() :
     actionCollection()->addAction(QStringLiteral("run_wizard"), action);
 
     setupGUI();
-    
+    foreach (QToolBar *toolBar, findChildren<QToolBar*>())
+        delete toolBar;
+
     if (!m_initialGroup.exists())
         runWizard();
 
diff --git a/src/minuetui.rc b/src/minuetui.rc
index df195e7..a7b4b9f 100644
--- a/src/minuetui.rc
+++ b/src/minuetui.rc
@@ -10,4 +10,6 @@
       <Action name="run_wizard" />
     </Menu>
 </MenuBar>
+<ToolBar noMerge="1" hidden="true" name="mainToolBar">
+</ToolBar>
 </gui>
[prev in list] [next in list] [prev in thread] [next in thread]