diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2020-09-04 11:21:54 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-09-07 14:55:51 +0200 |
| commit | 3acf24131c7cc1b7cccf59cab0d745099c28af5b (patch) | |
| tree | 2e6ad9e92da0c45b02bfc83b1bc53ed226e36d71 /src/imports/nativestyle/qstyle/qquickcommonstyle.cpp | |
| parent | 7938d08da8c69c7a0332c374a89a2ace38cccd1f (diff) | |
Native style: fix warnings in QStyle code
These break the build unless Qt is configured with
-no-warnings-are-errors.
Change-Id: I4a96efc0b29db60e7945fb9739a13da81f8d4c24
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/imports/nativestyle/qstyle/qquickcommonstyle.cpp')
| -rw-r--r-- | src/imports/nativestyle/qstyle/qquickcommonstyle.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp b/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp index 41f12545..fad47783 100644 --- a/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp +++ b/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp @@ -4668,6 +4668,7 @@ QSize QCommonStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt, c break; case CT_Dial: sz = QSize(20, 20); + break; case CT_Frame: if (const QStyleOptionFrame *option = qstyleoption_cast<const QStyleOptionFrame *>(opt)) { const int ninePatchSplit = 1; @@ -4701,7 +4702,7 @@ QFont QCommonStyle::font(QStyle::ControlElement element, const QStyle::State sta return QGuiApplication::font(); } -QMargins QCommonStyle::ninePatchMargins(QStyle::ControlElement ce, const QStyleOption *opt, const QSize &imageSize) const +QMargins QCommonStyle::ninePatchMargins(QStyle::ControlElement /*ce*/, const QStyleOption */*opt*/, const QSize &imageSize) const { // By default, we just divide the image at the center int w = imageSize.width() / 2; @@ -4709,7 +4710,7 @@ QMargins QCommonStyle::ninePatchMargins(QStyle::ControlElement ce, const QStyleO return QMargins(w, h, w, h); } -QMargins QCommonStyle::ninePatchMargins(QStyle::ComplexControl cc, const QStyleOptionComplex *opt, const QSize &imageSize) const +QMargins QCommonStyle::ninePatchMargins(QStyle::ComplexControl /*cc*/, const QStyleOptionComplex */*opt*/, const QSize &imageSize) const { // By default, we just divide the image at the center int w = imageSize.width() / 2; |