From 364bd6ca74b059ffe8ae367e1562645a3ed0855e Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Sun, 27 Aug 2017 19:07:31 +0200
Subject: Convert features.toolbar to QT_[REQUIRE_]CONFIG

Move declaration of pick/perp helpers up the dependency chain

Change-Id: I7084ed829a057a0c45d60445c416fb07f2cb5624
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/widgets/qtoolbarlayout.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/widgets/widgets/qtoolbarlayout.cpp')

diff --git a/src/widgets/widgets/qtoolbarlayout.cpp b/src/widgets/widgets/qtoolbarlayout.cpp
index 118cb2ae61..f2d329d59d 100644
--- a/src/widgets/widgets/qtoolbarlayout.cpp
+++ b/src/widgets/widgets/qtoolbarlayout.cpp
@@ -59,8 +59,6 @@
 #include "qtoolbarlayout_p.h"
 #include "qtoolbarseparator_p.h"
 
-#ifndef QT_NO_TOOLBAR
-
 QT_BEGIN_NAMESPACE
 
 // qmainwindow.cpp
@@ -753,5 +751,3 @@ QToolBarItem *QToolBarLayout::createItem(QAction *action)
 QT_END_NAMESPACE
 
 #include "moc_qtoolbarlayout_p.cpp"
-
-#endif // QT_NO_TOOLBAR
-- 
cgit v1.2.3