Convert features.tableview to QT_[REQUIRE_]CONFIG

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

6 files changed, 14 insertions, 16 deletions

diff --git a/src/widgets/itemviews/itemviews.pri b/src/widgets/itemviews/itemviews.pri
index af0a6f6898..4101be5631 100644
--- a/src/widgets/itemviews/itemviews.pri
+++ b/src/widgets/itemviews/itemviews.pri
@@ -9,8 +9,6 @@ HEADERS += \
 	itemviews/qlistview.h \
 	itemviews/qlistview_p.h \
 	itemviews/qbsptree_p.h \
-	itemviews/qtableview.h \
-	itemviews/qtableview_p.h \
 	itemviews/qtreeview.h \
 	itemviews/qtreeview_p.h \
 	itemviews/qabstractitemdelegate.h \
@@ -28,7 +26,6 @@ SOURCES += \
 	itemviews/qheaderview.cpp \
 	itemviews/qlistview.cpp \
 	itemviews/qbsptree.cpp \
-	itemviews/qtableview.cpp \
 	itemviews/qtreeview.cpp \
 	itemviews/qabstractitemdelegate.cpp \
         itemviews/qitemdelegate.cpp \
@@ -57,6 +54,14 @@ qtConfig(listwidget) {
     SOURCES += itemviews/qlistwidget.cpp
 }
 
+qtConfig(tableview) {
+    HEADERS += \
+        itemviews/qtableview.h \
+        itemviews/qtableview_p.h
+
+    SOURCES += itemviews/qtableview.cpp
+}
+
 qtConfig(tablewidget) {
     HEADERS += \
         itemviews/qtablewidget.h \
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index c8fdf06d64..f96bafdb57 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -53,7 +53,6 @@
 #include <qlineedit.h>
 #include <qspinbox.h>
 #include <qtreeview.h>
-#include <qtableview.h>
 #include <qheaderview.h>
 #include <qstyleditemdelegate.h>
 #include <private/qabstractitemview_p.h>
diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp
index 4149d3ac3a..0b8019c21c 100644
--- a/src/widgets/itemviews/qstyleditemdelegate.cpp
+++ b/src/widgets/itemviews/qstyleditemdelegate.cpp
@@ -67,7 +67,9 @@
 #include <private/qlayoutengine_p.h>
 #include <qdebug.h>
 #include <qlocale.h>
+#if QT_CONFIG(tableview)
 #include <qtableview.h>
+#endif
 
 #include <limits.h>
 
@@ -500,7 +502,7 @@ void QStyledItemDelegate::updateEditorGeometry(QWidget *editor,
     // let the editor take up all available space
     //if the editor is not a QLineEdit
     //or it is in a QTableView
-#if !defined(QT_NO_TABLEVIEW) && !defined(QT_NO_LINEEDIT)
+#if QT_CONFIG(tableview) && !defined(QT_NO_LINEEDIT)
     if (qobject_cast<QExpandingLineEdit*>(editor) && !qobject_cast<const QTableView*>(widget))
         opt.showDecorationSelected = editor->style()->styleHint(QStyle::SH_ItemView_ShowDecorationSelected, 0, editor);
     else
diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp
index b79932327b..2d5813198c 100644
--- a/src/widgets/itemviews/qtableview.cpp
+++ b/src/widgets/itemviews/qtableview.cpp
@@ -39,7 +39,6 @@
 
 #include "qtableview.h"
 
-#ifndef QT_NO_TABLEVIEW
 #include <qheaderview.h>
 #include <qitemdelegate.h>
 #include <qapplication.h>
@@ -3352,5 +3351,3 @@ QT_END_NAMESPACE
 #include "qtableview.moc"
 
 #include "moc_qtableview.cpp"
-
-#endif // QT_NO_TABLEVIEW
diff --git a/src/widgets/itemviews/qtableview.h b/src/widgets/itemviews/qtableview.h
index b1c38d521f..75f2e7b44c 100644
--- a/src/widgets/itemviews/qtableview.h
+++ b/src/widgets/itemviews/qtableview.h
@@ -43,10 +43,9 @@
 #include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qabstractitemview.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(tableview);
 
-#ifndef QT_NO_TABLEVIEW
+QT_BEGIN_NAMESPACE
 
 class QHeaderView;
 class QTableViewPrivate;
@@ -191,8 +190,6 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_updateSpanRemovedColumns(QModelIndex,int,int))
 };
 
-#endif // QT_NO_TABLEVIEW
-
 QT_END_NAMESPACE
 
 #endif // QTABLEVIEW_H
diff --git a/src/widgets/itemviews/qtableview_p.h b/src/widgets/itemviews/qtableview_p.h
index d2f45d557d..1a0fef9017 100644
--- a/src/widgets/itemviews/qtableview_p.h
+++ b/src/widgets/itemviews/qtableview_p.h
@@ -59,7 +59,7 @@
 #include <QtCore/QDebug>
 #include "private/qabstractitemview_p.h"
 
-#ifndef QT_NO_TABLEVIEW
+QT_REQUIRE_CONFIG(tableview);
 
 QT_BEGIN_NAMESPACE
 
@@ -261,6 +261,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_TABLEVIEW
-
 #endif // QTABLEVIEW_P_H