Convert features.datawidgetmappper to QT_[REQUIRE_]CONFIG

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

src/widgets/itemviews/itemviews.pri

@@ -13,7 +13,6 @@ HEADERS += \
 	itemviews/qwidgetitemdata_p.h \
 	itemviews/qitemeditorfactory.h \
 	itemviews/qitemeditorfactory_p.h \
-    itemviews/qdatawidgetmapper.h \
     itemviews/qstyleditemdelegate.h
 
 SOURCES += \
@@ -23,7 +22,6 @@ SOURCES += \
 	itemviews/qabstractitemdelegate.cpp \
         itemviews/qitemdelegate.cpp \
 	itemviews/qitemeditorfactory.cpp \
-    itemviews/qdatawidgetmapper.cpp \
     itemviews/qstyleditemdelegate.cpp
 }
 
@@ -38,6 +36,11 @@ qtConfig(columnview) {
         itemviews/qcolumnviewgrip.cpp
 }
 
+qtConfig(datawidgetmapper) {
+    HEADERS += itemviews/qdatawidgetmapper.h
+    SOURCES += itemviews/qdatawidgetmapper.cpp
+}
+
 qtConfig(dirmodel) {
     HEADERS += itemviews/qdirmodel.h
     SOURCES += itemviews/qdirmodel.cpp

src/widgets/itemviews/qdatawidgetmapper.cpp

@@ -39,8 +39,6 @@
 
 #include "qdatawidgetmapper.h"
 
-#ifndef QT_NO_DATAWIDGETMAPPER
-
 #include "qabstractitemmodel.h"
 #include "qitemdelegate.h"
 #include "qmetaobject.h"
@@ -827,5 +825,3 @@ QDataWidgetMapper::SubmitPolicy QDataWidgetMapper::submitPolicy() const
 QT_END_NAMESPACE
 
 #include "moc_qdatawidgetmapper.cpp"
-
-#endif // QT_NO_DATAWIDGETMAPPER

src/widgets/itemviews/qdatawidgetmapper.h

@@ -43,11 +43,10 @@
 #include <QtWidgets/qtwidgetsglobal.h>
 #include "QtCore/qobject.h"
 
-#ifndef QT_NO_DATAWIDGETMAPPER
+QT_REQUIRE_CONFIG(datawidgetmapper);
 
 QT_BEGIN_NAMESPACE
 
-
 class QAbstractItemDelegate;
 class QAbstractItemModel;
 class QModelIndex;
@@ -117,6 +116,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_DATAWIDGETMAPPER
 #endif
-