diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-05-27 10:51:28 +0200 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2021-05-28 15:30:54 +0200 |
| commit | d298214d9356dc68b834ae605493728d0d8abe1d (patch) | |
| tree | 70256d0b54ee97e0b11fd184043b59af3b2730ab | |
| parent | 7c511fa00c3449c0d6e8ade3576234e77dceb9d3 (diff) | |
Fix MSVC warning C4065
MSVC doesn't like it when there's only a default switch:
qquickwindowsstyle.cpp(2284): warning C4065: switch statement contains 'default' but no 'case' labels
Pick-to: 6.1
Change-Id: I3d6072e88a3aeec3a6801c2b0ddffd8e9f511943
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | src/imports/nativestyle/qstyle/windows/qquickwindowsstyle.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/imports/nativestyle/qstyle/windows/qquickwindowsstyle.cpp b/src/imports/nativestyle/qstyle/windows/qquickwindowsstyle.cpp index d8cf7f32..242b770d 100644 --- a/src/imports/nativestyle/qstyle/windows/qquickwindowsstyle.cpp +++ b/src/imports/nativestyle/qstyle/windows/qquickwindowsstyle.cpp @@ -1885,8 +1885,9 @@ QRect QWindowsStyle::subElementRect(SubElement sr, const QStyleOption *opt) cons void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p) const { +#if 0 switch (cc) { -#if 0 && QT_CONFIG(slider) +#if QT_CONFIG(slider) case CC_Slider: if (const QStyleOptionSlider *slider = qstyleoption_cast<const QStyleOptionSlider *>(opt)) { int thickness = proxy()->pixelMetric(PM_SliderControlThickness, slider); @@ -2104,7 +2105,7 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp } break; #endif // QT_CONFIG(slider) -#if 0 && QT_CONFIG(scrollbar) +#if QT_CONFIG(scrollbar) case CC_ScrollBar: if (const QStyleOptionSlider *scrollbar = qstyleoption_cast<const QStyleOptionSlider *>(opt)) { QStyleOptionSlider newScrollbar = *scrollbar; @@ -2114,7 +2115,7 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp } break; #endif // QT_CONFIG(scrollbar) -#if 0 && QT_CONFIG(combobox) +#if QT_CONFIG(combobox) case CC_ComboBox: if (const QStyleOptionComboBox *cmb = qstyleoption_cast<const QStyleOptionComboBox *>(opt)) { QBrush editBrush = cmb->palette.brush(QPalette::Button); @@ -2188,7 +2189,7 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp } break; #endif // QT_CONFIG(combobox) -#if 0 && QT_CONFIG(spinbox) +#if QT_CONFIG(spinbox) case CC_SpinBox: if (const QStyleOptionSpinBox *sb = qstyleoption_cast<const QStyleOptionSpinBox *>(opt)) { QStyleOptionSpinBox copy = *sb; @@ -2278,10 +2279,12 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp } break; #endif // QT_CONFIG(spinbox) - default: QCommonStyle::drawComplexControl(cc, opt, p); } +#else // 0 + QCommonStyle::drawComplexControl(cc, opt, p); +#endif } /*! \reimp */ |