From 75d4958e508e864fada5f7999c14172f758a85c2 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Fri, 5 Aug 2022 14:53:20 +0200 Subject: [PATCH] QCommonStyle: use logging categories Use qCWarning instead of qWarning, to give users more control over debug output if needed. Fixes: QTBUG-105332 Change-Id: I830dd160f75eb9885d80b80336bfb27da676e4bc Reviewed-by: Richard Moe Gustavsen --- src/widgets/styles/qcommonstyle.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index bf6aca03803..f1d8a11990a 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -78,6 +78,8 @@ #include #endif +#include + #include #include @@ -85,6 +87,8 @@ QT_BEGIN_NAMESPACE +Q_LOGGING_CATEGORY(lcCommonStyle, "qt.widgets.commonstyle"); + using namespace Qt::StringLiterals; static qreal qt_getDevicePixelRatio(const QWidget *widget) @@ -1104,7 +1108,7 @@ void QCommonStylePrivate::viewItemLayout(const QStyleOptionViewItem *opt, QRect } break; } default: - qWarning("doLayout: decoration position is invalid"); + qCWarning(lcCommonStyle, "doLayout: decoration position is invalid"); decoration = *pixmapRect; break; } @@ -3875,7 +3879,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl break; #endif // QT_CONFIG(mdiarea) default: - qWarning("QCommonStyle::drawComplexControl: Control %d not handled", cc); + qCWarning(lcCommonStyle, "QCommonStyle::drawComplexControl: Control %d not handled", cc); } } @@ -4011,7 +4015,7 @@ QStyle::SubControl QCommonStyle::hitTestComplexControl(ComplexControl cc, const } break; default: - qWarning("QCommonStyle::hitTestComplexControl: Case %d not handled", cc); + qCWarning(lcCommonStyle, "QCommonStyle::hitTestComplexControl: Case %d not handled", cc); } return sc; } @@ -4450,7 +4454,7 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex } #endif // QT_CONFIG(mdiarea) default: - qWarning("QCommonStyle::subControlRect: Case %d not handled", cc); + qCWarning(lcCommonStyle, "QCommonStyle::subControlRect: Case %d not handled", cc); } #if !QT_CONFIG(slider) && !QT_CONFIG(spinbox) && !QT_CONFIG(toolbutton) && !QT_CONFIG(groupbox) Q_UNUSED(widget);