1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Declare logging category exported in tst_QDockWidget

Browse Source 
The logging category lcQpaDockWidgets was explicitly declared in
tst_QDockWidget. That failed to complile on static builds.

This patch replaces the explicit declaration with
Q_DECLARE_EXPORTED_LOGGING_CATEGORY(lcQpaDockWidgets, Q_WIDGETS_EXPORT)

Pick-to: 6.4 6.3 6.2
Change-Id: I1cad0e672313be84297eeddf992f6cafe9a35977
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Axel Spoerl 2022-08-05 13:36:20 +02:00
parent 5f5c4598fe
commit 8e9fdfec0a
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/widgets/qmainwindowlayout_p.h
View File

@ -43,7 +43,7 @@ QT_REQUIRE_CONFIG(mainwindow);
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
Q_DECLARE_LOGGING_CATEGORY(lcQpaDockWidgets); Q_DECLARE_EXPORTED_LOGGING_CATEGORY(lcQpaDockWidgets, Q_WIDGETS_EXPORT);
class QToolBar; class QToolBar;
class QRubberBand; class QRubberBand;

6
tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
View File

@ -16,12 +16,6 @@
#include <QtGui/QPainter> #include <QtGui/QPainter>
#include <QLabel> #include <QLabel>
#ifdef QT_BUILD_INTERNAL
QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(lcQpaDockWidgets, "qt.widgets.dockwidgets");
QT_END_NAMESPACE
#endif
bool hasFeature(QDockWidget *dockwidget, QDockWidget::DockWidgetFeature feature) bool hasFeature(QDockWidget *dockwidget, QDockWidget::DockWidgetFeature feature)
{ return (dockwidget->features() & feature) == feature; } { return (dockwidget->features() & feature) == feature; }