From e70258a155e5dbc0429ff75bcc857d188b60dbfd Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Sun, 9 Jul 2017 17:01:21 +0200
Subject: Convert features.listview to QT_[REQUIRE_]CONFIG

Change-Id: I707a839bcfc7ad481342d1adb98c9b593f5ca6e2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/sql/models/qsqlrelationaldelegate.h           |  2 ++
 src/widgets/accessible/complexwidgets.cpp         |  1 -
 src/widgets/accessible/itemviews.cpp              |  4 +++-
 src/widgets/graphicsview/qgraphicsproxywidget.cpp |  1 -
 src/widgets/itemviews/itemviews.pri               | 11 ++++++++---
 src/widgets/itemviews/qlistview.cpp               |  3 ---
 src/widgets/itemviews/qlistview.h                 |  7 ++-----
 src/widgets/itemviews/qlistview_p.h               |  4 +---
 src/widgets/styles/qmacstyle_mac_p_p.h            |  2 ++
 src/widgets/styles/qpixmapstyle.cpp               |  2 ++
 src/widgets/styles/qwindowsstyle.cpp              |  4 +++-
 src/widgets/styles/qwindowsvistastyle_p_p.h       |  2 ++
 src/widgets/styles/qwindowsxpstyle.cpp            |  2 ++
 src/widgets/util/qcompleter.cpp                   | 14 ++++++++------
 14 files changed, 35 insertions(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/sql/models/qsqlrelationaldelegate.h b/src/sql/models/qsqlrelationaldelegate.h
index a689e88ba3..42c0cc27b1 100644
--- a/src/sql/models/qsqlrelationaldelegate.h
+++ b/src/sql/models/qsqlrelationaldelegate.h
@@ -45,7 +45,9 @@
 #ifdef QT_WIDGETS_LIB
 
 #include <QtWidgets/qitemdelegate.h>
+#if QT_CONFIG(listview)
 #include <QtWidgets/qlistview.h>
+#endif
 #include <QtWidgets/qcombobox.h>
 #include <QtSql/qsqldriver.h>
 #include <QtSql/qsqlrelationaltablemodel.h>
diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp
index 50aba759c3..42775d7324 100644
--- a/src/widgets/accessible/complexwidgets.cpp
+++ b/src/widgets/accessible/complexwidgets.cpp
@@ -45,7 +45,6 @@
 #include <qheaderview.h>
 #include <qtabbar.h>
 #include <qcombobox.h>
-#include <qlistview.h>
 #include <qlineedit.h>
 #include <qstyle.h>
 #include <qstyleoption.h>
diff --git a/src/widgets/accessible/itemviews.cpp b/src/widgets/accessible/itemviews.cpp
index 4d1a4589ee..1ccfcbe4e5 100644
--- a/src/widgets/accessible/itemviews.cpp
+++ b/src/widgets/accessible/itemviews.cpp
@@ -43,7 +43,9 @@
 #if QT_CONFIG(tableview)
 #include <qtableview.h>
 #endif
+#if QT_CONFIG(listview)
 #include <qlistview.h>
+#endif
 #if QT_CONFIG(treeview)
 #include <qtreeview.h>
 #include <private/qtreeview_p.h>
@@ -96,7 +98,7 @@ QAccessibleTable::QAccessibleTable(QWidget *w)
         m_role = QAccessible::Tree;
     } else
 #endif
-#ifndef QT_NO_LISTVIEW
+#if QT_CONFIG(listview)
     if (qobject_cast<const QListView*>(view())) {
         m_role = QAccessible::List;
     } else
diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.cpp b/src/widgets/graphicsview/qgraphicsproxywidget.cpp
index eface182ae..5e692abd73 100644
--- a/src/widgets/graphicsview/qgraphicsproxywidget.cpp
+++ b/src/widgets/graphicsview/qgraphicsproxywidget.cpp
@@ -55,7 +55,6 @@
 #include <QtGui/qpainter.h>
 #include <QtWidgets/qstyleoption.h>
 #include <QtWidgets/qgraphicsview.h>
-#include <QtWidgets/qlistview.h>
 #include <QtWidgets/qlineedit.h>
 #include <QtWidgets/qtextedit.h>
 
diff --git a/src/widgets/itemviews/itemviews.pri b/src/widgets/itemviews/itemviews.pri
index c68aa590bc..effe9017e9 100644
--- a/src/widgets/itemviews/itemviews.pri
+++ b/src/widgets/itemviews/itemviews.pri
@@ -6,8 +6,6 @@ HEADERS += \
     itemviews/qabstractitemview_p.h \
 	itemviews/qheaderview.h \
 	itemviews/qheaderview_p.h \
-	itemviews/qlistview.h \
-	itemviews/qlistview_p.h \
 	itemviews/qbsptree_p.h \
 	itemviews/qabstractitemdelegate.h \
         itemviews/qabstractitemdelegate_p.h \
@@ -22,7 +20,6 @@ HEADERS += \
 SOURCES += \
 	itemviews/qabstractitemview.cpp \
 	itemviews/qheaderview.cpp \
-	itemviews/qlistview.cpp \
 	itemviews/qbsptree.cpp \
 	itemviews/qabstractitemdelegate.cpp \
         itemviews/qitemdelegate.cpp \
@@ -43,6 +40,14 @@ qtConfig(columnview) {
         itemviews/qcolumnviewgrip.cpp
 }
 
+qtConfig(listview) {
+    HEADERS += \
+        itemviews/qlistview.h \
+        itemviews/qlistview_p.h
+
+    SOURCES += itemviews/qlistview.cpp
+}
+
 qtConfig(listwidget) {
     HEADERS += \
         itemviews/qlistwidget.h \
diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp
index ca416d9c04..83962f3bbc 100644
--- a/src/widgets/itemviews/qlistview.cpp
+++ b/src/widgets/itemviews/qlistview.cpp
@@ -40,7 +40,6 @@
 
 #include "qlistview.h"
 
-#ifndef QT_NO_LISTVIEW
 #include <qabstractitemdelegate.h>
 #include <qapplication.h>
 #include <qpainter.h>
@@ -3298,5 +3297,3 @@ QSize QListView::viewportSizeHint() const
 QT_END_NAMESPACE
 
 #include "moc_qlistview.cpp"
-
-#endif // QT_NO_LISTVIEW
diff --git a/src/widgets/itemviews/qlistview.h b/src/widgets/itemviews/qlistview.h
index 6b164aeec8..66ec9b18b1 100644
--- a/src/widgets/itemviews/qlistview.h
+++ b/src/widgets/itemviews/qlistview.h
@@ -43,10 +43,9 @@
 #include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qabstractitemview.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(listview);
 
-#ifndef QT_NO_LISTVIEW
+QT_BEGIN_NAMESPACE
 
 class QListViewPrivate;
 
@@ -195,8 +194,6 @@ private:
     Q_DISABLE_COPY(QListView)
 };
 
-#endif // QT_NO_LISTVIEW
-
 QT_END_NAMESPACE
 
 #endif // QLISTVIEW_H
diff --git a/src/widgets/itemviews/qlistview_p.h b/src/widgets/itemviews/qlistview_p.h
index 6c0e470a93..8d29767951 100644
--- a/src/widgets/itemviews/qlistview_p.h
+++ b/src/widgets/itemviews/qlistview_p.h
@@ -58,7 +58,7 @@
 #include <limits.h>
 #include <qscrollbar.h>
 
-#ifndef QT_NO_LISTVIEW
+QT_REQUIRE_CONFIG(listview);
 
 QT_BEGIN_NAMESPACE
 
@@ -474,6 +474,4 @@ inline bool QCommonListViewBase::isRightToLeft() const { return qq->isRightToLef
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_LISTVIEW
-
 #endif // QLISTVIEW_P_H
diff --git a/src/widgets/styles/qmacstyle_mac_p_p.h b/src/widgets/styles/qmacstyle_mac_p_p.h
index 7ff6279284..4a3ff1b8bf 100644
--- a/src/widgets/styles/qmacstyle_mac_p_p.h
+++ b/src/widgets/styles/qmacstyle_mac_p_p.h
@@ -69,7 +69,9 @@
 #include <qheaderview.h>
 #include <qlayout.h>
 #include <qlineedit.h>
+#if QT_CONFIG(listview)
 #include <qlistview.h>
+#endif
 #include <qmainwindow.h>
 #include <qmap.h>
 #include <qmenubar.h>
diff --git a/src/widgets/styles/qpixmapstyle.cpp b/src/widgets/styles/qpixmapstyle.cpp
index 88482d28c9..20c9040a53 100644
--- a/src/widgets/styles/qpixmapstyle.cpp
+++ b/src/widgets/styles/qpixmapstyle.cpp
@@ -54,7 +54,9 @@
 #include <QEvent>
 #include <QComboBox>
 #include <QAbstractItemView>
+#if QT_CONFIG(listview)
 #include <QListView>
+#endif
 #include <QStyledItemDelegate>
 #include <QAbstractScrollArea>
 #include <QScrollBar>
diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp
index f805e29db1..d0ede56010 100644
--- a/src/widgets/styles/qwindowsstyle.cpp
+++ b/src/widgets/styles/qwindowsstyle.cpp
@@ -65,7 +65,9 @@
 #if QT_CONFIG(wizard)
 #include "qwizard.h"
 #endif
+#if QT_CONFIG(listview)
 #include "qlistview.h"
+#endif
 #include <private/qmath_p.h>
 #include <qmath.h>
 #include <QtGui/qscreen.h>
@@ -548,7 +550,7 @@ int QWindowsStyle::styleHint(StyleHint hint, const QStyleOption *opt, const QWid
 
         break;
     case SH_ItemView_ShowDecorationSelected:
-#ifndef QT_NO_LISTVIEW
+#if QT_CONFIG(listview)
         if (qobject_cast<const QListView*>(widget))
             ret = 1;
 #endif
diff --git a/src/widgets/styles/qwindowsvistastyle_p_p.h b/src/widgets/styles/qwindowsvistastyle_p_p.h
index 5d772204a7..5c342df5a6 100644
--- a/src/widgets/styles/qwindowsvistastyle_p_p.h
+++ b/src/widgets/styles/qwindowsvistastyle_p_p.h
@@ -76,7 +76,9 @@
 #include <qscrollbar.h>
 #include <qprogressbar.h>
 #include <qdockwidget.h>
+#if QT_CONFIG(listview)
 #include <qlistview.h>
+#endif
 #if QT_CONFIG(treeview)
 #include <qtreeview.h>
 #endif
diff --git a/src/widgets/styles/qwindowsxpstyle.cpp b/src/widgets/styles/qwindowsxpstyle.cpp
index 87ac2ee4ae..e1c32d4ed6 100644
--- a/src/widgets/styles/qwindowsxpstyle.cpp
+++ b/src/widgets/styles/qwindowsxpstyle.cpp
@@ -63,7 +63,9 @@
 #include <qscrollbar.h>
 #include <qheaderview.h>
 #include <qspinbox.h>
+#if QT_CONFIG(listview)
 #include <qlistview.h>
+#endif
 #include <qstackedwidget.h>
 #if QT_CONFIG(pushbutton)
 #include <qpushbutton.h>
diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp
index c412c4cbd5..9119c7896f 100644
--- a/src/widgets/util/qcompleter.cpp
+++ b/src/widgets/util/qcompleter.cpp
@@ -152,7 +152,9 @@
 #include "QtWidgets/qfilesystemmodel.h"
 #endif
 #include "QtWidgets/qheaderview.h"
+#if QT_CONFIG(listview)
 #include "QtWidgets/qlistview.h"
+#endif
 #include "QtWidgets/qapplication.h"
 #include "QtGui/qevent.h"
 #include "QtWidgets/qdesktopwidget.h"
@@ -816,11 +818,11 @@ void QCompleterPrivate::init(QAbstractItemModel *m)
     proxy = new QCompletionModel(this, q);
     QObject::connect(proxy, SIGNAL(rowsAdded()), q, SLOT(_q_autoResizePopup()));
     q->setModel(m);
-#ifdef QT_NO_LISTVIEW
+#if !QT_CONFIG(listview)
     q->setCompletionMode(QCompleter::InlineCompletion);
 #else
     q->setCompletionMode(QCompleter::PopupCompletion);
-#endif // QT_NO_LISTVIEW
+#endif // QT_CONFIG(listview)
 }
 
 void QCompleterPrivate::setCurrentIndex(QModelIndex index, bool select)
@@ -1214,7 +1216,7 @@ void QCompleter::setPopup(QAbstractItemView *popup)
     popup->setFocusProxy(d->widget);
     popup->installEventFilter(this);
     popup->setItemDelegate(new QCompleterItemDelegate(popup));
-#ifndef QT_NO_LISTVIEW
+#if QT_CONFIG(listview)
     if (QListView *listView = qobject_cast<QListView *>(popup)) {
         listView->setModelColumn(d->column);
     }
@@ -1238,7 +1240,7 @@ void QCompleter::setPopup(QAbstractItemView *popup)
 QAbstractItemView *QCompleter::popup() const
 {
     Q_D(const QCompleter);
-#ifndef QT_NO_LISTVIEW
+#if QT_CONFIG(listview)
     if (!d->popup && completionMode() != QCompleter::InlineCompletion) {
         QListView *listView = new QListView;
         listView->setEditTriggers(QAbstractItemView::NoEditTriggers);
@@ -1249,7 +1251,7 @@ QAbstractItemView *QCompleter::popup() const
         QCompleter *that = const_cast<QCompleter*>(this);
         that->setPopup(listView);
     }
-#endif // QT_NO_LISTVIEW
+#endif // QT_CONFIG(listview)
     return d->popup;
 }
 
@@ -1580,7 +1582,7 @@ void QCompleter::setCompletionColumn(int column)
     Q_D(QCompleter);
     if (d->column == column)
         return;
-#ifndef QT_NO_LISTVIEW
+#if QT_CONFIG(listview)
     if (QListView *listView = qobject_cast<QListView *>(d->popup))
         listView->setModelColumn(column);
 #endif
-- 
cgit v1.2.3