From 7c61eb101d527a749caf9329bbf4298999ca7c88 Mon Sep 17 00:00:00 2001 From: Axel Spoerl Date: Mon, 15 Aug 2022 05:41:36 +0000 Subject: Revert Q_DECLARE_EXPORTED_LOGGING_CATEGORY in tst_qdockwidget MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Q_DECLARE_EXPORTED_LOGGING_CATEGORY is available from 6.5 only, hence cherrypicking this solution fails. Change-Id: Ib3351a8846bb5cf6047cd2d13c9f7cd242df9c93 Reviewed-by: Tor Arne Vestbø --- src/widgets/widgets/qmainwindowlayout_p.h | 2 +- tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index 9196e8b269..394a052a09 100644 --- a/src/widgets/widgets/qmainwindowlayout_p.h +++ b/src/widgets/widgets/qmainwindowlayout_p.h @@ -43,7 +43,7 @@ QT_REQUIRE_CONFIG(mainwindow); QT_BEGIN_NAMESPACE -Q_DECLARE_EXPORTED_LOGGING_CATEGORY(lcQpaDockWidgets, Q_WIDGETS_EXPORT); +Q_DECLARE_LOGGING_CATEGORY(lcQpaDockWidgets); class QToolBar; class QRubberBand; diff --git a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp index 6b1abac228..2229f5da55 100644 --- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp +++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp @@ -16,6 +16,12 @@ #include #include +#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) { return (dockwidget->features() & feature) == feature; } -- cgit v1.2.3