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/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 ++
 5 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/widgets/styles')

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>
-- 
cgit v1.2.3