diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:30:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:31:48 +0200 |
| commit | 106d3b9bf93325ea93c678270290b2c3dda9b764 (patch) | |
| tree | 26c56932d60964c83e81d9c33d6f37ebc36d6c56 /src/widgets/styles/qstylehelper.cpp | |
| parent | 79f679da9483c12979500dd48bc096d33af9ca6f (diff) | |
| parent | 8bebded9ab02b8eec67c44bfddf802d6bf9cda3c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoamenu.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/widgets/styles/qstylehelper_p.h
Change-Id: I54247c98dd79d2b3826fc062b8b11048c9c7d9bb
Diffstat (limited to 'src/widgets/styles/qstylehelper.cpp')
| -rw-r--r-- | src/widgets/styles/qstylehelper.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/styles/qstylehelper.cpp b/src/widgets/styles/qstylehelper.cpp index 6a5a27ed6d..94376a63e3 100644 --- a/src/widgets/styles/qstylehelper.cpp +++ b/src/widgets/styles/qstylehelper.cpp @@ -43,7 +43,9 @@ #include <private/qmath_p.h> #include <private/qstyle_p.h> #include <qmath.h> +#if QT_CONFIG(scrollbar) #include <qscrollbar.h> +#endif #include <qabstractscrollarea.h> #include <qwindow.h> @@ -131,7 +133,7 @@ bool hasAncestor(QObject *obj, QAccessible::Role role) #endif // QT_NO_ACCESSIBILITY -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) int calcBigLineSize(int radius) { @@ -350,7 +352,7 @@ void drawDial(const QStyleOptionSlider *option, QPainter *painter) painter->drawEllipse(dialRect); painter->restore(); } -#endif //QT_NO_DIAL +#endif //QT_CONFIG(dial) void drawBorderPixmap(const QPixmap &pixmap, QPainter *painter, const QRect &rect, int left, int top, int right, |