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>

1 files changed, 17 insertions, 11 deletions

diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri
index a197c41b95..55804c5aaf 100644
--- a/src/widgets/widgets/widgets.pri
+++ b/src/widgets/widgets/widgets.pri
@@ -3,25 +3,16 @@
 HEADERS += \
         widgets/qframe.h \
         widgets/qframe_p.h \
-        widgets/qtoolbar.h \
-        widgets/qtoolbar_p.h \
-        widgets/qtoolbarlayout_p.h \
-        widgets/qtoolbarseparator_p.h \
         widgets/qabstractscrollarea.h \
         widgets/qabstractscrollarea_p.h \
         widgets/qfocusframe.h \
-        widgets/qwidgetanimator_p.h \
-        widgets/qtoolbararealayout_p.h
+        widgets/qwidgetanimator_p.h
 
 SOURCES += \
         widgets/qframe.cpp \
-        widgets/qtoolbar.cpp \
-        widgets/qtoolbarlayout.cpp \
-        widgets/qtoolbarseparator.cpp \
         widgets/qabstractscrollarea.cpp \
         widgets/qfocusframe.cpp \
-        widgets/qwidgetanimator.cpp \
-        widgets/qtoolbararealayout.cpp
+        widgets/qwidgetanimator.cpp
 
 qtConfig(abstractbutton) {
     HEADERS += \
@@ -326,6 +317,21 @@ qtConfig(tabwidget) {
     SOURCES += widgets/qtabwidget.cpp
 }
 
+qtConfig(toolbar) {
+    HEADERS += \
+        widgets/qtoolbar.h \
+        widgets/qtoolbar_p.h \
+        widgets/qtoolbararealayout_p.h \
+        widgets/qtoolbarlayout_p.h \
+        widgets/qtoolbarseparator_p.h
+
+    SOURCES += \
+        widgets/qtoolbar.cpp \
+        widgets/qtoolbarlayout.cpp \
+        widgets/qtoolbararealayout.cpp \
+        widgets/qtoolbarseparator.cpp
+}
+
 qtConfig(toolbox) {
     HEADERS += widgets/qtoolbox.h
     SOURCES += widgets/qtoolbox.cpp