3 files changed, 7 insertions, 11 deletions
diff --git a/src/widgets/widgets/qtoolbox.cpp b/src/widgets/widgets/qtoolbox.cpp
index 8413827e30..fdcd07eb06 100644
--- a/src/widgets/widgets/qtoolbox.cpp
+++ b/src/widgets/widgets/qtoolbox.cpp
@@ -39,8 +39,6 @@
 
 #include "qtoolbox.h"
 
-#ifndef QT_NO_TOOLBOX
-
 #include <qapplication.h>
 #include <qeventloop.h>
 #include <qlayout.h>
@@ -734,5 +732,3 @@ QT_END_NAMESPACE
 
 #include "moc_qtoolbox.cpp"
 #include "qtoolbox.moc"
-
-#endif //QT_NO_TOOLBOX
diff --git a/src/widgets/widgets/qtoolbox.h b/src/widgets/widgets/qtoolbox.h
index 6556d8a202..321507ba07 100644
--- a/src/widgets/widgets/qtoolbox.h
+++ b/src/widgets/widgets/qtoolbox.h
@@ -44,10 +44,9 @@
 #include <QtWidgets/qframe.h>
 #include <QtGui/qicon.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(toolbox);
 
-#ifndef QT_NO_TOOLBOX
+QT_BEGIN_NAMESPACE
 
 class QToolBoxPrivate;
 
@@ -119,8 +118,6 @@ inline int QToolBox::addItem(QWidget *item, const QIcon &iconSet,
 inline int QToolBox::insertItem(int index, QWidget *item, const QString &text)
 { return insertItem(index, item, QIcon(), text); }
 
-#endif // QT_NO_TOOLBOX
-
 QT_END_NAMESPACE
 
 #endif // QTOOLBOX_H
diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri
index eff98c717a..1ab8a85e0c 100644
--- a/src/widgets/widgets/widgets.pri
+++ b/src/widgets/widgets/widgets.pri
@@ -38,7 +38,6 @@ HEADERS += \
         widgets/qtoolbarlayout_p.h \
         widgets/qtoolbarextension_p.h \
         widgets/qtoolbarseparator_p.h \
-        widgets/qtoolbox.h \
         widgets/qtoolbutton.h \
         widgets/qabstractscrollarea.h \
         widgets/qabstractscrollarea_p.h \
@@ -77,7 +76,6 @@ SOURCES += \
         widgets/qtoolbarlayout.cpp \
         widgets/qtoolbarextension.cpp \
         widgets/qtoolbarseparator.cpp \
-        widgets/qtoolbox.cpp \
         widgets/qtoolbutton.cpp \
         widgets/qabstractscrollarea.cpp \
         widgets/qwidgetresizehandler.cpp \
@@ -248,6 +246,11 @@ qtConfig(tabwidget) {
     SOURCES += widgets/qtabwidget.cpp
 }
 
+qtConfig(toolbox) {
+    HEADERS += widgets/qtoolbox.h
+    SOURCES += widgets/qtoolbox.cpp
+}
+
 qtConfig(widgettextcontrol) {
     HEADERS += \
         widgets/qwidgettextcontrol_p.h \