diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:34:32 -0700 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:36:10 -0700 |
| commit | d38fe875c7850ca2c6ca28f91e94ae276735fac8 (patch) | |
| tree | e5c92cef74e0853490d77cf0139b23f00d548a6e /src/plugins/styles/mac/qmacstyle_mac_p_p.h | |
| parent | ac4e848c9802377b7c4ff673180f28b9ca76b746 (diff) | |
| parent | 627f0a7f7d775ecd263b95dd07fca44bfcb0c5cf (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmainwindowlayout.cpp
Change-Id: I306b4f5ad11bceb336c9091241b468d455fe6bb6
Diffstat (limited to 'src/plugins/styles/mac/qmacstyle_mac_p_p.h')
| -rw-r--r-- | src/plugins/styles/mac/qmacstyle_mac_p_p.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/styles/mac/qmacstyle_mac_p_p.h b/src/plugins/styles/mac/qmacstyle_mac_p_p.h index 7c9c0f8f3c..f1c355e621 100644 --- a/src/plugins/styles/mac/qmacstyle_mac_p_p.h +++ b/src/plugins/styles/mac/qmacstyle_mac_p_p.h @@ -82,7 +82,9 @@ #include <qpushbutton.h> #endif #include <qradiobutton.h> +#if QT_CONFIG(rubberband) #include <qrubberband.h> +#endif #include <qsizegrip.h> #include <qspinbox.h> #include <qsplitter.h> @@ -92,9 +94,13 @@ #include <qtoolbar.h> #include <qtoolbutton.h> #include <qtreeview.h> +#if QT_CONFIG(tableview) #include <qtableview.h> +#endif #include <qdebug.h> +#if QT_CONFIG(datetimeedit) #include <qdatetimeedit.h> +#endif #include <qmath.h> #include <qpair.h> #include <qvector.h> @@ -164,7 +170,7 @@ typedef void (^QCocoaDrawRectBlock)(CGContextRef, const CGRect &); do { \ static const int sizes[] = { (large), (small), (mini) }; \ return sizes[controlSize]; \ - } while (0) + } while (false) #if QT_CONFIG(pushbutton) bool qt_mac_buttonIsRenderedFlat(const QPushButton *pushButton, const QStyleOptionButton *option); @@ -242,7 +248,7 @@ public: void drawFocusRing(QPainter *p, const QRect &targetRect, int hMargin, int vMargin, qreal radius = 0) const; #ifndef QT_NO_TABBAR - void tabLayout(const QStyleOptionTab *opt, const QWidget *widget, QRect *textRect) const; + void tabLayout(const QStyleOptionTab *opt, const QWidget *widget, QRect *textRect, QRect *iconRect) const; #endif public: |