aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <[email protected]>2024-06-03 08:30:15 +0200
committerJani Heikkinen <[email protected]>2024-06-03 08:59:11 +0000
commitb241e3f8bc951dfbac152bbf58532170ed910756 (patch)
tree47d31eaee1a5e96d08d331d27ba29b17d4c549d8
parentf5a964cafee1902e7a57793240c37a2273743f9b (diff)
QuickTemplates: Rename lcPopup logging categoryv6.8.0-beta1
It clashes with a name in QtGui. Fixes: QTBUG-126011 Change-Id: Ie3f0a177873133d06b5367a21bd5a0f1eba5a905 Reviewed-by: Jukka Jokiniva <[email protected]>
-rw-r--r--src/quicktemplates/qquickpopup.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quicktemplates/qquickpopup.cpp b/src/quicktemplates/qquickpopup.cpp
index 29e550ca44..2b400b905d 100644
--- a/src/quicktemplates/qquickpopup.cpp
+++ b/src/quicktemplates/qquickpopup.cpp
@@ -26,7 +26,7 @@
QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(lcDimmer, "qt.quick.controls.popup.dimmer")
-Q_LOGGING_CATEGORY(lcPopup, "qt.quick.controls.popup")
+Q_LOGGING_CATEGORY(lcQuickPopup, "qt.quick.controls.popup")
/*!
\qmltype Popup
@@ -2840,7 +2840,7 @@ void QQuickPopup::classBegin()
void QQuickPopup::componentComplete()
{
Q_D(QQuickPopup);
- qCDebug(lcPopup) << "componentComplete" << this;
+ qCDebug(lcQuickPopup) << "componentComplete" << this;
if (!parentItem())
resetParentItem();
@@ -3000,7 +3000,7 @@ void QQuickPopup::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem)
void QQuickPopup::contentSizeChange(const QSizeF &newSize, const QSizeF &oldSize)
{
- qCDebug(lcPopup) << "contentSizeChange called on" << this << "with newSize" << newSize << "oldSize" << oldSize;
+ qCDebug(lcQuickPopup) << "contentSizeChange called on" << this << "with newSize" << newSize << "oldSize" << oldSize;
if (!qFuzzyCompare(newSize.width(), oldSize.width()))
emit contentWidthChanged();
if (!qFuzzyCompare(newSize.height(), oldSize.height()))
@@ -3017,7 +3017,7 @@ void QQuickPopup::fontChange(const QFont &newFont, const QFont &oldFont)
void QQuickPopup::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
{
Q_D(QQuickPopup);
- qCDebug(lcPopup) << "geometryChange called on" << this << "with newGeometry" << newGeometry << "oldGeometry" << oldGeometry;
+ qCDebug(lcQuickPopup) << "geometryChange called on" << this << "with newGeometry" << newGeometry << "oldGeometry" << oldGeometry;
d->reposition();
if (!qFuzzyCompare(newGeometry.width(), oldGeometry.width())) {
emit widthChanged();