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

Revert Q_DECLARE_EXPORTED_LOGGING_CATEGORY in tst_qdockwidget

Browse Source 
Q_DECLARE_EXPORTED_LOGGING_CATEGORY is available from 6.5 only, hence
cherrypicking this solution fails.

Change-Id: Ib3351a8846bb5cf6047cd2d13c9f7cd242df9c93
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Axel Spoerl 2022-08-15 05:41:36 +00:00
parent 767bac9c5e
commit 7c61eb101d
2 changed files with 7 additions and 1 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_EXPORTED_LOGGING_CATEGORY(lcQpaDockWidgets, Q_WIDGETS_EXPORT); Q_DECLARE_LOGGING_CATEGORY(lcQpaDockWidgets);
class QToolBar; class QToolBar;
class QRubberBand; class QRubberBand;

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

@ -16,6 +16,12 @@
#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; }