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/qtoolbar_p.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/widgets/widgets/qtoolbar_p.h')

diff --git a/src/widgets/widgets/qtoolbar_p.h b/src/widgets/widgets/qtoolbar_p.h
index 616f53f717..4db75762c8 100644
--- a/src/widgets/widgets/qtoolbar_p.h
+++ b/src/widgets/widgets/qtoolbar_p.h
@@ -57,9 +57,9 @@
 #include "private/qwidget_p.h"
 #include <QtCore/qbasictimer.h>
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(toolbar);
 
-#ifndef QT_NO_TOOLBAR
+QT_BEGIN_NAMESPACE
 
 class QToolBarLayout;
 class QTimer;
@@ -127,8 +127,6 @@ public:
     QBasicTimer waitForPopupTimer;
 };
 
-#endif // QT_NO_TOOLBAR
-
 QT_END_NAMESPACE
 
 #endif // QDYNAMICTOOLBAR_P_H
-- 
cgit v1.2.3