diff options
| author | Axel Spoerl <axel.spoerl@qt.io> | 2022-08-15 05:41:36 +0000 |
|---|---|---|
| committer | Axel Spoerl <axel.spoerl@qt.io> | 2022-08-23 20:49:47 +0200 |
| commit | 7c61eb101d527a749caf9329bbf4298999ca7c88 (patch) | |
| tree | dcbc42c71305175b46415de98249b71f80274cc9 | |
| parent | 767bac9c5e48ee47e053c7370a8c9bdbe139a7d9 (diff) | |
Revert Q_DECLARE_EXPORTED_LOGGING_CATEGORY in tst_qdockwidget
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>
| -rw-r--r-- | src/widgets/widgets/qmainwindowlayout_p.h | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
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 <QtGui/QPainter> #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) { return (dockwidget->features() & feature) == feature; } |