diff options
| author | Ulf Hermann <[email protected]> | 2024-06-06 08:50:10 +0200 |
|---|---|---|
| committer | Ulf Hermann <[email protected]> | 2024-06-07 19:38:50 +0200 |
| commit | 11e94341109235d4fa2a69011ea211ccd540210f (patch) | |
| tree | b0481f7e9a2551e046d335263447f8115373b59f /src/gui | |
| parent | 86075fa35a997c1e05a2316ba3dc93a30ba3966b (diff) | |
Logging: Introduce a macro to declare an exported Qt logging category
In a follow-up change we will hide Qt's own logging categories in a
namespace. As a result the declaration for Qt's logging categories has
to be different from the declaration for user logging categories.
Introduce a separate macro to declare a logging category exported from
Qt to user code/plugins/tools etc.
Task-number: QTBUG-67692
Change-Id: Ia5ef5225cc0d01e6375e0d2fa1fd7367a5afedc2
Reviewed-by: Thiago Macieira <[email protected]>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qplatformkeymapper.h | 2 | ||||
| -rw-r--r-- | src/gui/opengl/qopenglprogrambinarycache_p.h | 2 | ||||
| -rw-r--r-- | src/gui/painting/qplatformbackingstore.h | 2 | ||||
| -rw-r--r-- | src/gui/platform/darwin/qmetallayer_p.h | 2 | ||||
| -rw-r--r-- | src/gui/text/qplatformfontdatabase.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/kernel/qplatformkeymapper.h b/src/gui/kernel/qplatformkeymapper.h index fb5b0cdb8bd..431adc668c7 100644 --- a/src/gui/kernel/qplatformkeymapper.h +++ b/src/gui/kernel/qplatformkeymapper.h @@ -18,7 +18,7 @@ QT_BEGIN_NAMESPACE -Q_DECLARE_EXPORTED_LOGGING_CATEGORY(lcQpaKeyMapper, Q_GUI_EXPORT) +QT_DECLARE_EXPORTED_QT_LOGGING_CATEGORY(lcQpaKeyMapper, Q_GUI_EXPORT) class QKeyEvent; diff --git a/src/gui/opengl/qopenglprogrambinarycache_p.h b/src/gui/opengl/qopenglprogrambinarycache_p.h index c3850bdee39..6a636fcf56e 100644 --- a/src/gui/opengl/qopenglprogrambinarycache_p.h +++ b/src/gui/opengl/qopenglprogrambinarycache_p.h @@ -28,7 +28,7 @@ QT_BEGIN_NAMESPACE // therefore stay independent from QOpenGLShader(Program). Must rely only on // QOpenGLContext/Functions. -Q_DECLARE_EXPORTED_LOGGING_CATEGORY(lcOpenGLProgramDiskCache, Q_GUI_EXPORT) +QT_DECLARE_EXPORTED_QT_LOGGING_CATEGORY(lcOpenGLProgramDiskCache, Q_GUI_EXPORT) class Q_GUI_EXPORT QOpenGLProgramBinaryCache { diff --git a/src/gui/painting/qplatformbackingstore.h b/src/gui/painting/qplatformbackingstore.h index 2f27a2aa2c1..a6cb43b4e66 100644 --- a/src/gui/painting/qplatformbackingstore.h +++ b/src/gui/painting/qplatformbackingstore.h @@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE -Q_DECLARE_EXPORTED_LOGGING_CATEGORY(lcQpaBackingStore, Q_GUI_EXPORT) +QT_DECLARE_EXPORTED_QT_LOGGING_CATEGORY(lcQpaBackingStore, Q_GUI_EXPORT) class QRegion; class QRect; diff --git a/src/gui/platform/darwin/qmetallayer_p.h b/src/gui/platform/darwin/qmetallayer_p.h index 1c19f218665..81f8760ec26 100644 --- a/src/gui/platform/darwin/qmetallayer_p.h +++ b/src/gui/platform/darwin/qmetallayer_p.h @@ -26,7 +26,7 @@ QT_BEGIN_NAMESPACE class QReadWriteLock; -Q_DECLARE_EXPORTED_LOGGING_CATEGORY(lcMetalLayer, Q_GUI_EXPORT) +QT_DECLARE_EXPORTED_QT_LOGGING_CATEGORY(lcMetalLayer, Q_GUI_EXPORT) QT_END_NAMESPACE diff --git a/src/gui/text/qplatformfontdatabase.h b/src/gui/text/qplatformfontdatabase.h index 3007a11838f..f8f4d3bfaea 100644 --- a/src/gui/text/qplatformfontdatabase.h +++ b/src/gui/text/qplatformfontdatabase.h @@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE -Q_DECLARE_EXPORTED_LOGGING_CATEGORY(lcQpaFonts, Q_GUI_EXPORT) +QT_DECLARE_EXPORTED_QT_LOGGING_CATEGORY(lcQpaFonts, Q_GUI_EXPORT) class QWritingSystemsPrivate; |