Skip to content

Commit a844fd2

Browse files
committed
Fix build with -no-feature-dockwidget
Amends b9a003d Change-Id: I1e82153b76016003b71eadc15fd8177836e27daf Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
1 parent 0a893aa commit a844fd2

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

src/widgets/widgets/qdockarealayout_p.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,15 @@
2020
#include <QtWidgets/private/qwidgetanimator_p.h>
2121
#include "QtWidgets/qlayout.h"
2222
#include "QtCore/qlist.h"
23+
#include "QtCore/qloggingcategory.h"
2324
#include "QtCore/qrect.h"
2425

2526
QT_REQUIRE_CONFIG(dockwidget);
2627

2728
QT_BEGIN_NAMESPACE
2829

30+
Q_DECLARE_LOGGING_CATEGORY(lcQpaDockWidgets);
31+
2932
class QLayoutItem;
3033
class QWidget;
3134
class QLayoutItem;

src/widgets/widgets/qmainwindowlayout.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@
5555

5656
QT_BEGIN_NAMESPACE
5757

58+
Q_LOGGING_CATEGORY(lcMainWindowLayout, "qt.mainwindow.layout");
59+
5860
#if defined(Q_OS_MACOS)
5961
Q_STATIC_LOGGING_CATEGORY(lcUnifiedToolBar, "qt.mainwindow.unifiedtoolbar");
6062
#endif
@@ -205,7 +207,7 @@ QDebug operator<<(QDebug debug, StateMarkers marker)
205207
QDataStream &operator<<(QDataStream &stream, StateMarkers marker)
206208
{
207209
stream << uchar(marker);
208-
qCDebug(lcQpaDockWidgets) << "Writing state marker" << marker;
210+
qCDebug(lcMainWindowLayout) << "Writing state marker" << marker;
209211
return stream;
210212
}
211213

@@ -214,7 +216,7 @@ QDataStream &operator>>(QDataStream &stream, StateMarkers &marker)
214216
uchar m;
215217
stream >> m;
216218
marker = static_cast<StateMarkers>(m);
217-
qCDebug(lcQpaDockWidgets) << "Reading state marker" << marker;
219+
qCDebug(lcMainWindowLayout) << "Reading state marker" << marker;
218220
return stream;
219221
}
220222
#endif // QT_NO_DEBUG_STREAM

src/widgets/widgets/qmainwindowlayout_p.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ QT_REQUIRE_CONFIG(mainwindow);
5555

5656
QT_BEGIN_NAMESPACE
5757

58-
Q_DECLARE_LOGGING_CATEGORY(lcQpaDockWidgets);
58+
Q_DECLARE_LOGGING_CATEGORY(lcMainWindowLayout);
5959

6060
class QToolBar;
6161
class QRubberBand;

0 commit comments

Comments
 (0)