qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

expected: do not include qconfig.h 

qconfig.h does not have inclusion guards, so it should no be included
directly: it can break code as qcompilerdetection.h undef-ines its
symbols.

Pick-to: 6.10
Fixes: QTBUG-140149
Task-number: QTBUG-140150
Change-Id: Ic655a87ebeccd3cbc66286fd92279da8ca11cad3
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tim Blechmann 2025-09-14 12:39:43 +08:00
parent 0e4ea3969c
commit 901ccf7608
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/patches/tlexpected/0001-tl-expected-disable-exceptions-with-qt-s-macros.patch
View File

@ -15,8 +15,8 @@ index a54aea1f7d7..45c6196c947 100644
@@ -34,6 +34,7 @@
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qassert.h>
+#include <QtCore/qtconfiginclude.h>
#include <QtCore/qtconfigmacros.h>
+#include <QtCore/qconfig.h>
#include <exception>
#include <functional>

2
src/corelib/global/qexpected_p.h
View File

@ -36,8 +36,8 @@
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qassert.h>
#include <QtCore/qtconfiginclude.h>
#include <QtCore/qtconfigmacros.h>
#include <QtCore/qconfig.h>
#include <exception>
#include <functional>