diff options
| author | Kaloyan Chehlarski <kaloyan.chehlarski@qt.io> | 2025-06-06 11:29:55 +0200 |
|---|---|---|
| committer | Kaloyan Chehlarski <kaloyan.chehlarski@qt.io> | 2025-06-13 10:18:48 +0200 |
| commit | 95be93326fffeabad813da69789b4acd64e0d467 (patch) | |
| tree | 9ac08990908ae99f36e516eb3286bd815e9fd2f4 /src/core/api | |
| parent | d0445ac41e199bc1ffffc9d9912a7bc2927997cc (diff) | |
Remove logging category macro version checks
The version checks were already wrong, because we also need to support
building 6.11 on top of 6.8, assuming 6.11 is the next LTS. Instead of
fixing them, this commit removes them entirely, to avoid future
submodule update breakage. The explanatory comments have been amended to
correctly reflect when the workaround macros should actually be removed.
Change-Id: Iff894be9697a63eec67ddbe815617b1069e74e3b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/api')
| -rw-r--r-- | src/core/api/qtwebenginecoreglobal_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/api/qtwebenginecoreglobal_p.h b/src/core/api/qtwebenginecoreglobal_p.h index 80d82552c..f434e7114 100644 --- a/src/core/api/qtwebenginecoreglobal_p.h +++ b/src/core/api/qtwebenginecoreglobal_p.h @@ -32,14 +32,12 @@ // introduced alongside the new logging category macros in Qt 6.9. Since we need to support // building with older versions up to and including the last LTS release (6.8), we can't simply // switch to using Q_STATIC_LOGGING_CATEGORY. This file and the macro definition within -// are intended to be removed in the next Qt 6 LTS release. -#if QT_VERSION < QT_VERSION_CHECK(6, 11, 0) +// are intended to be removed in the next Qt 6 LTS+1 release. #if defined(Q_STATIC_LOGGING_CATEGORY) #define Q_WEBENGINE_LOGGING_CATEGORY(name, ...) Q_STATIC_LOGGING_CATEGORY(name, __VA_ARGS__) #else #define Q_WEBENGINE_LOGGING_CATEGORY(name, ...) Q_LOGGING_CATEGORY(name, __VA_ARGS__) #endif -#endif namespace QtWebEngineCore { Q_WEBENGINECORE_EXPORT int processMain(int argc, const char **argv); |