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

Guard xmlstream header in a source-compatible way

Browse Source 
Using QT_REQUIRE_CONFIG results in a static_assert if the xmlstream
feature is not available. This is a SiC change, as the user has
no reasonable ways to guard against it.
Fix it by using

 if QT_CONFIG(xmlstream)

instead.

This commit amends 7337474d041d7e4a7a33157ebd7d84406ed13966

Change-Id: I0c55e4cff06157743c05a543a092f9be1eb67c2d
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 4601717378fb6822226cf4ad1e5e52960bf0a773)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ivan Solovev 2023-07-18 11:01:04 +02:00 committed by Qt Cherry-pick Bot
parent 303d7cabd3
commit d760569dee
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/serialization/qxmlstream.h
View File

@ -6,7 +6,7 @@
#include <QtCore/qiodevice.h>
QT_REQUIRE_CONFIG(xmlstream);
#if QT_CONFIG(xmlstream)
#include <QtCore/qlist.h>
#include <QtCore/qscopedpointer.h>
@ -418,4 +418,6 @@ private:
QT_END_NAMESPACE
#endif // feature xmlstream
#endif // QXMLSTREAM_H