Move the <version> include from qcompilerdetection.h to qtconfiginclude.h
The idea ofbb10b2ed29b8d9was 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 since61935786c3(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 since22029a76c3. 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 amendsb2ed29b8d9. 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)
parent
c5ac6e08fb
commit
f36cf92db6
|
|
@ -460,12 +460,6 @@
|
|||
# define QT_ASAN_ENABLED
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
# if __has_include(<version>) /* remove this check once Integrity, QNX have caught up */
|
||||
# include <version>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* C++11 support
|
||||
*
|
||||
|
|
|
|||
|
|
@ -8,6 +8,12 @@
|
|||
# pragma qt_sync_stop_processing
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
# if __has_include(<version>) /* remove this check once Integrity, QNX have caught up */
|
||||
# include <version>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include <QtCore/qconfig.h>
|
||||
|
||||
#ifdef QT_BOOTSTRAPPED
|
||||
|
|
|
|||
Loading…
Reference in New Issue