diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-29 08:46:49 +0200 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-08-10 05:37:17 +0000 |
| commit | 414026ad9c3e92b1c6a715543175acb922d703e2 (patch) | |
| tree | 70cab464b13ace5a3e3ab56e70347b4ee7f433e2 /src/widgets/styles/qstylesheetstyle.cpp | |
| parent | d1a3e674b6b9a98e16aa26fe05688e7099cd2b9b (diff) | |
Convert features.scrollbar to QT_[REQUIRE_]CONFIG
Change-Id: Id6ea899c0fddf0de636701cfdc5f01ba20024976
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/styles/qstylesheetstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qstylesheetstyle.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 2b5b09a46a..740fb4fa47 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -61,7 +61,9 @@ #include <qtooltip.h> #include <qshareddata.h> #include <qtoolbutton.h> +#if QT_CONFIG(scrollbar) #include <qscrollbar.h> +#endif #if QT_CONFIG(abstractslider) #include <qabstractslider.h> #endif @@ -3198,7 +3200,7 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC } break; -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) case CC_ScrollBar: if (const QStyleOptionSlider *sb = qstyleoption_cast<const QStyleOptionSlider *>(opt)) { QStyleOptionSlider sbOpt(*sb); @@ -3213,7 +3215,7 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC return; } break; -#endif // QT_NO_SCROLLBAR +#endif // QT_CONFIG(scrollbar) #ifndef QT_NO_SLIDER case CC_Slider: @@ -4760,7 +4762,7 @@ int QStyleSheetStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const return subRule.box()->spacing; break; -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) case PM_ScrollBarExtent: if (rule.hasContentsSize()) { QSize sz = rule.size(); @@ -4784,7 +4786,7 @@ int QStyleSheetStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const if(!rule.hasNativeBorder() || rule.hasBox()) return 0; break; -#endif // QT_NO_SCROLLBAR +#endif // QT_CONFIG(scrollbar) case PM_ProgressBarChunkWidth: subRule = renderRule(w, opt, PseudoElement_ProgressBarChunk); @@ -5525,7 +5527,7 @@ QRect QStyleSheetStyle::subControlRect(ComplexControl cc, const QStyleOptionComp } break; -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) case CC_ScrollBar: if (const QStyleOptionSlider *sb = qstyleoption_cast<const QStyleOptionSlider *>(opt)) { QStyleOptionSlider styleOptionSlider(*sb); @@ -5607,7 +5609,7 @@ QRect QStyleSheetStyle::subControlRect(ComplexControl cc, const QStyleOptionComp : QWindowsStyle::subControlRect(cc, &styleOptionSlider, sc, w); } break; -#endif // QT_NO_SCROLLBAR +#endif // QT_CONFIG(scrollbar) #ifndef QT_NO_SLIDER case CC_Slider: |