diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 09:47:29 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 09:47:29 +0200 |
| commit | 407302fb1b823fbe0ae09c031862f87b252489e6 (patch) | |
| tree | f192faf40b9009ee6a884ed4b7d0b3942b6810ac /src/widgets/styles | |
| parent | 0f30dcaea8129092142fe87d2d14209c75363f66 (diff) | |
| parent | ad3b41a06d9ba7219c79b5548c5b11698787288d (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/io/qwindowspipewriter.cpp
src/widgets/styles/qcommonstyle.cpp
Change-Id: I0d33efdc4dc256e234abc490a18ccda72cd1d9e6
Diffstat (limited to 'src/widgets/styles')
| -rw-r--r-- | src/widgets/styles/qcommonstyle.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/styles/qfusionstyle.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/styles/qpixmapstyle.cpp | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 593dc9e779..ceff1a50a3 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> @@ -5252,7 +5255,7 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget case SH_Widget_Animate: // TODO Qt6: move this code in the SH_Widget_Animation_Duration case // and replace false with 0 and true with 200. -#ifndef QT_NO_TREEVIEW +#if QT_CONFIG(treeview) if (qobject_cast<const QTreeView*>(widget)) { ret = false; } else diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index eb7a1599d6..1e584f47b8 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -3668,7 +3668,6 @@ int QFusionStyle::styleHint(StyleHint hint, const QStyleOption *option, const QW case SH_ScrollView_FrameOnlyAroundContents: case SH_Menu_AllowActiveAndDisabled: case SH_MainWindow_SpaceBelowMenuBar: - case SH_DialogButtonBox_ButtonsHaveIcons: case SH_MessageBox_CenterButtons: case SH_RubberBand_Mask: return 0; 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> |