summaryrefslogtreecommitdiffstats
path: root/src/widgets/styles
diff options
context:
space:
mode:
authorStephan Binner <stephan.binner@basyskom.com>2017-07-09 17:01:21 +0200
committerStephan Binner <stephan.binner@basyskom.com>2017-07-21 10:36:28 +0000
commite70258a155e5dbc0429ff75bcc857d188b60dbfd (patch)
tree5a09f37668f50a5dc26cb46ce0eb9fa3c3bf9e1b /src/widgets/styles
parent6e2eeee7f5ad30070c9195f78aa0d5e740d7daf3 (diff)
Convert features.listview to QT_[REQUIRE_]CONFIG
Change-Id: I707a839bcfc7ad481342d1adb98c9b593f5ca6e2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/styles')
-rw-r--r--src/widgets/styles/qmacstyle_mac_p_p.h2
-rw-r--r--src/widgets/styles/qpixmapstyle.cpp2
-rw-r--r--src/widgets/styles/qwindowsstyle.cpp4
-rw-r--r--src/widgets/styles/qwindowsvistastyle_p_p.h2
-rw-r--r--src/widgets/styles/qwindowsxpstyle.cpp2
5 files changed, 11 insertions, 1 deletions
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>