4 files changed, 11 insertions, 14 deletions
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