Convert features.toolbutton to QT_[REQUIRE_]CONFIG

Change-Id: I4227e1868da21bded76a8ec55996c436c8a8d763
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>

9 files changed, 24 insertions, 20 deletions

diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h
index 2d695f8411..92bdd4ad60 100644
--- a/src/widgets/widgets/qlineedit_p.h
+++ b/src/widgets/widgets/qlineedit_p.h
@@ -56,7 +56,9 @@
 #ifndef QT_NO_LINEEDIT
 #include "private/qwidget_p.h"
 #include "QtWidgets/qlineedit.h"
+#if QT_CONFIG(toolbutton)
 #include "QtWidgets/qtoolbutton.h"
+#endif
 #include "QtGui/qtextlayout.h"
 #include "QtGui/qicon.h"
 #include "QtWidgets/qstyleoption.h"
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index 167a10efc3..4848eba7ec 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -66,7 +66,9 @@
 #include "qmenu_p.h"
 #include "qmenubar_p.h"
 #include "qwidgetaction.h"
+#if QT_CONFIG(toolbutton)
 #include "qtoolbutton.h"
+#endif
 #include "qpushbutton.h"
 #include "qtooltip.h"
 #include <private/qpushbutton_p.h>
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index 552409a4ed..fd48058ec3 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -51,7 +51,9 @@
 #include <qevent.h>
 #include <qmainwindow.h>
 #include <qtoolbar.h>
+#if QT_CONFIG(toolbutton)
 #include <qtoolbutton.h>
+#endif
 #if QT_CONFIG(whatsthis)
 #include <qwhatsthis.h>
 #endif
diff --git a/src/widgets/widgets/qtoolbarextension.cpp b/src/widgets/widgets/qtoolbarextension.cpp
index 267e220b8f..47cf16e0cc 100644
--- a/src/widgets/widgets/qtoolbarextension.cpp
+++ b/src/widgets/widgets/qtoolbarextension.cpp
@@ -43,8 +43,6 @@
 #include <qstylepainter.h>
 #include <qstyleoption.h>
 
-#ifndef QT_NO_TOOLBUTTON
-
 QT_BEGIN_NAMESPACE
 
 QToolBarExtension::QToolBarExtension(QWidget *parent)
@@ -88,5 +86,3 @@ QSize QToolBarExtension::sizeHint() const
 QT_END_NAMESPACE
 
 #include "moc_qtoolbarextension_p.cpp"
-
-#endif // QT_NO_TOOLBUTTON
diff --git a/src/widgets/widgets/qtoolbarextension_p.h b/src/widgets/widgets/qtoolbarextension_p.h
index c4d803165c..b6223107c4 100644
--- a/src/widgets/widgets/qtoolbarextension_p.h
+++ b/src/widgets/widgets/qtoolbarextension_p.h
@@ -54,9 +54,9 @@
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "QtWidgets/qtoolbutton.h"
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(toolbutton);
 
-#ifndef QT_NO_TOOLBUTTON
+QT_BEGIN_NAMESPACE
 
 class Q_AUTOTEST_EXPORT QToolBarExtension : public QToolButton
 {
@@ -71,8 +71,6 @@ public Q_SLOTS:
     void setOrientation(Qt::Orientation o);
 };
 
-#endif // QT_NO_TOOLBUTTON
-
 QT_END_NAMESPACE
 
 #endif // QDYNAMICTOOLBAREXTENSION_P_H
diff --git a/src/widgets/widgets/qtoolbarlayout.cpp b/src/widgets/widgets/qtoolbarlayout.cpp
index 39e61a1951..118cb2ae61 100644
--- a/src/widgets/widgets/qtoolbarlayout.cpp
+++ b/src/widgets/widgets/qtoolbarlayout.cpp
@@ -42,7 +42,9 @@
 #include <qwidgetaction.h>
 #include <qtoolbar.h>
 #include <qstyleoption.h>
+#if QT_CONFIG(toolbutton)
 #include <qtoolbutton.h>
+#endif
 #include <qmenu.h>
 #include <qdebug.h>
 #include <qmath.h>
@@ -51,7 +53,9 @@
 #endif
 
 #include "qmainwindowlayout_p.h"
+#if QT_CONFIG(toolbutton)
 #include "qtoolbarextension_p.h"
+#endif
 #include "qtoolbarlayout_p.h"
 #include "qtoolbarseparator_p.h"
 
diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp
index 13595575e6..f2c5814203 100644
--- a/src/widgets/widgets/qtoolbutton.cpp
+++ b/src/widgets/widgets/qtoolbutton.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include "qtoolbutton.h"
-#ifndef QT_NO_TOOLBUTTON
 
 #include <qapplication.h>
 #include <qdesktopwidget.h>
@@ -985,5 +984,3 @@ bool QToolButton::event(QEvent *event)
 QT_END_NAMESPACE
 
 #include "moc_qtoolbutton.cpp"
-
-#endif
diff --git a/src/widgets/widgets/qtoolbutton.h b/src/widgets/widgets/qtoolbutton.h
index e2470524da..7ba9a18fef 100644
--- a/src/widgets/widgets/qtoolbutton.h
+++ b/src/widgets/widgets/qtoolbutton.h
@@ -42,12 +42,11 @@
 
 #include <QtWidgets/qtwidgetsglobal.h>
 
-#if QT_CONFIG(toolbutton)
-
 #include <QtWidgets/qabstractbutton.h>
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(toolbutton);
 
+QT_BEGIN_NAMESPACE
 
 class QToolButtonPrivate;
 class QMenu;
@@ -137,6 +136,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_CONFIG(toolbutton)
-
 #endif // QTOOLBUTTON_H
diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri
index 2753b92ae4..c204dad08d 100644
--- a/src/widgets/widgets/widgets.pri
+++ b/src/widgets/widgets/widgets.pri
@@ -31,9 +31,7 @@ HEADERS += \
         widgets/qtoolbar.h \
         widgets/qtoolbar_p.h \
         widgets/qtoolbarlayout_p.h \
-        widgets/qtoolbarextension_p.h \
         widgets/qtoolbarseparator_p.h \
-        widgets/qtoolbutton.h \
         widgets/qabstractscrollarea.h \
         widgets/qabstractscrollarea_p.h \
         widgets/qwidgetresizehandler_p.h \
@@ -66,9 +64,7 @@ SOURCES += \
         widgets/qtextedit.cpp \
         widgets/qtoolbar.cpp \
         widgets/qtoolbarlayout.cpp \
-        widgets/qtoolbarextension.cpp \
         widgets/qtoolbarseparator.cpp \
-        widgets/qtoolbutton.cpp \
         widgets/qabstractscrollarea.cpp \
         widgets/qwidgetresizehandler.cpp \
         widgets/qfocusframe.cpp \
@@ -264,6 +260,16 @@ qtConfig(toolbox) {
     SOURCES += widgets/qtoolbox.cpp
 }
 
+qtConfig(toolbutton) {
+    HEADERS += \
+        widgets/qtoolbutton.h \
+        widgets/qtoolbarextension_p.h
+
+    SOURCES += \
+        widgets/qtoolbutton.cpp \
+        widgets/qtoolbarextension.cpp
+}
+
 qtConfig(widgettextcontrol) {
     HEADERS += \
         widgets/qwidgettextcontrol_p.h \