From 8e9fdfec0afc01f192b222af60c13955a63b594f Mon Sep 17 00:00:00 2001 From: Axel Spoerl Date: Fri, 5 Aug 2022 13:36:20 +0200 Subject: [PATCH] Declare logging category exported in tst_QDockWidget MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ø --- src/widgets/widgets/qmainwindowlayout_p.h | 2 +- tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index 394a052a091..9196e8b269d 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_LOGGING_CATEGORY(lcQpaDockWidgets); +Q_DECLARE_EXPORTED_LOGGING_CATEGORY(lcQpaDockWidgets, Q_WIDGETS_EXPORT); 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 2229f5da556..6b1abac228e 100644 --- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp +++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp @@ -16,12 +16,6 @@ #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; }