1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move the <version> include from qcompilerdetection.h to qtconfiginclude.h

Browse Source 
The idea of b2ed29b8d9b33dcece83000aee28073dd27f1cd9 was to have the
contents of <version> (if it exists) available in all Qt headers.

Since we broke up qglobal.h into smaller pieces, qcompilerdetection.h
is no longer necessarily included by any given Qt header, which
thwards the original idea.

Try with qtconfiginclude.h, which exists since
61935786c30b0209811fa32f7a02f138da8570b2 (Qt 6.6).

For Qt 6.5, we'll need to add it separately to qtversionchecks.h and
qtconfigmacros.h, whence qtconfiginclude.h was extracted, as well as
keeping it in qcompilerdetection.h, which includes qtconfiginclude.h
only since 22029a76c37d8d670479d523684a84f7966ed434.

Amends the breaking of qglobal.h into smaller headers, without being
attributable to any one of the individual commits that made up the
change, or else amends b2ed29b8d9b33dcece83000aee28073dd27f1cd9.

Pick-to: 6.5
Task-number: QTBUG-108228
Change-Id: I909196bd767e8d9e016069f1a59994d40e646e59
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 4771dc308785ed132198b2c9a3200b7eb26d683e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 2a5d850e4889913462da644f5146f14acf9633a4)
This commit is contained in:
Marc Mutz 2025-01-17 16:53:53 +01:00 committed by Qt Cherry-pick Bot
parent c5ac6e08fb
commit f36cf92db6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/global/qcompilerdetection.h
View File

@ -460,12 +460,6 @@
# define QT_ASAN_ENABLED # define QT_ASAN_ENABLED
#endif #endif
#ifdef __cplusplus
# if __has_include(<version>) /* remove this check once Integrity, QNX have caught up */
# include <version>
# endif
#endif
/* /*
* C++11 support * C++11 support
* *

6
src/corelib/global/qtconfiginclude.h
View File

@ -8,6 +8,12 @@
# pragma qt_sync_stop_processing # pragma qt_sync_stop_processing
#endif #endif
#ifdef __cplusplus
# if __has_include(<version>) /* remove this check once Integrity, QNX have caught up */
# include <version>
# endif
#endif
#include <QtCore/qconfig.h> #include <QtCore/qconfig.h>
#ifdef QT_BOOTSTRAPPED #ifdef QT_BOOTSTRAPPED