diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-09 16:55:03 +0200 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-15 16:46:38 +0000 |
| commit | 773178900f39febb0509cb4170bc091c9f91d3b3 (patch) | |
| tree | a0bcc17a72f075793cf2438cd260e03b577ef277 /src/widgets/styles | |
| parent | a23568be6c6859b3a149cfadb1104da4f32318f5 (diff) | |
Convert features.treeview to QT_[REQUIRE_]CONFIG
Change-Id: I4a036a0410615ac563b17f7715c47acccb8abfca
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/styles')
| -rw-r--r-- | src/widgets/styles/qcommonstyle.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/styles/qmacstyle_mac.mm | 6 | ||||
| -rw-r--r-- | src/widgets/styles/qmacstyle_mac_p_p.h | 2 | ||||
| -rw-r--r-- | src/widgets/styles/qpixmapstyle.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/styles/qwindowsvistastyle_p_p.h | 2 |
5 files changed, 12 insertions, 4 deletions
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 56f9bfb3e7..973e89b3ef 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -41,6 +41,7 @@ #include "qcommonstyle_p.h" #include <qfile.h> +#include <qabstractitemview.h> #include <qapplication.h> #include <private/qguiapplication_p.h> #include <qpa/qplatformtheme.h> @@ -71,7 +72,9 @@ #if QT_CONFIG(rubberband) #include <qrubberband.h> #endif +#if QT_CONFIG(treeview) #include "qtreeview.h" +#endif #include <private/qcommonstylepixmaps_p.h> #include <private/qmath_p.h> #include <qdebug.h> @@ -5250,7 +5253,7 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget break; #endif case SH_Widget_Animate: -#ifndef QT_NO_TREEVIEW +#if QT_CONFIG(treeview) if (qobject_cast<const QTreeView*>(widget)) { ret = false; } else diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index 8a6e32105a..99526683dd 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -88,7 +88,9 @@ #include <qstyleoption.h> #include <qtoolbar.h> #include <qtoolbutton.h> +#if QT_CONFIG(treeview) #include <qtreeview.h> +#endif #if QT_CONFIG(tableview) #include <qtableview.h> #endif @@ -420,7 +422,7 @@ static int getControlSize(const QStyleOption *option, const QWidget *widget) } -#ifndef QT_NO_TREEVIEW +#if QT_CONFIG(treeview) static inline bool isTreeView(const QWidget *widget) { return (widget && widget->parentWidget() && @@ -899,7 +901,7 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg break; #endif case QStyle::CT_HeaderSection: -#ifndef QT_NO_TREEVIEW +#if QT_CONFIG(treeview) if (isTreeView(widg)) ret = QSize(-1, qt_mac_aqua_get_metric(kThemeMetricListHeaderHeight)); #endif diff --git a/src/widgets/styles/qmacstyle_mac_p_p.h b/src/widgets/styles/qmacstyle_mac_p_p.h index 514cc8a14e..7ff6279284 100644 --- a/src/widgets/styles/qmacstyle_mac_p_p.h +++ b/src/widgets/styles/qmacstyle_mac_p_p.h @@ -93,7 +93,9 @@ #include <qtextstream.h> #include <qtoolbar.h> #include <qtoolbutton.h> +#if QT_CONFIG(treeview) #include <qtreeview.h> +#endif #if QT_CONFIG(tableview) #include <qtableview.h> #endif diff --git a/src/widgets/styles/qpixmapstyle.cpp b/src/widgets/styles/qpixmapstyle.cpp index de99b6ce7b..88482d28c9 100644 --- a/src/widgets/styles/qpixmapstyle.cpp +++ b/src/widgets/styles/qpixmapstyle.cpp @@ -55,7 +55,6 @@ #include <QComboBox> #include <QAbstractItemView> #include <QListView> -#include <QTreeView> #include <QStyledItemDelegate> #include <QAbstractScrollArea> #include <QScrollBar> diff --git a/src/widgets/styles/qwindowsvistastyle_p_p.h b/src/widgets/styles/qwindowsvistastyle_p_p.h index 01fe32c1c6..5d772204a7 100644 --- a/src/widgets/styles/qwindowsvistastyle_p_p.h +++ b/src/widgets/styles/qwindowsvistastyle_p_p.h @@ -77,7 +77,9 @@ #include <qprogressbar.h> #include <qdockwidget.h> #include <qlistview.h> +#if QT_CONFIG(treeview) #include <qtreeview.h> +#endif #include <qtextedit.h> #include <qmessagebox.h> #if QT_CONFIG(dialogbuttonbox) |