Remove QXml* from bootstrap lib

Those classes are not used by any bootstrapped tool.

Also remove the QT_BOOTSTRAPPED code paths.

Change-Id: Ic5a9b153a578fedcba37cd81a62ccf0182a2d34f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Joerg Bornemann 2022-01-27 14:44:13 +01:00
parent 4fb5923432
commit d03385df9d
3 changed files with 1 additions and 20 deletions

View File

@ -49,20 +49,7 @@
#include <qstack.h> #include <qstack.h>
#include <qbuffer.h> #include <qbuffer.h>
#include <qscopeguard.h> #include <qscopeguard.h>
#ifndef QT_BOOTSTRAPPED
#include <qcoreapplication.h> #include <qcoreapplication.h>
#else
// This specialization of Q_DECLARE_TR_FUNCTIONS is not in qcoreapplication.h,
// because that header depends on QObject being available, which is not the
// case for most bootstrapped applications.
#define Q_DECLARE_TR_FUNCTIONS(context) \
public: \
static inline QString tr(const char *sourceText, const char *comment = nullptr) \
{ Q_UNUSED(comment); return QString::fromUtf8(sourceText); } \
static inline QString tr(const char *sourceText, const char*, int) \
{ return QString::fromUtf8(sourceText); } \
private:
#endif
#include <iterator> #include <iterator>
#include "qxmlstream_p.h" #include "qxmlstream_p.h"

View File

@ -64,9 +64,6 @@ qt_internal_extend_target(Bootstrap
../../corelib/serialization/qjsonvalue.cpp ../../corelib/serialization/qjsonvalue.cpp
../../corelib/serialization/qjsonwriter.cpp ../../corelib/serialization/qjsonwriter.cpp
../../corelib/serialization/qtextstream.cpp ../../corelib/serialization/qtextstream.cpp
../../corelib/serialization/qxmlstream.cpp
../../corelib/serialization/qxmlstreamgrammar.cpp
../../corelib/serialization/qxmlutils.cpp
../../corelib/text/qbytearray.cpp ../../corelib/text/qbytearray.cpp
../../corelib/text/qbytearraylist.cpp ../../corelib/text/qbytearraylist.cpp
../../corelib/text/qbytearraymatcher.cpp ../../corelib/text/qbytearraymatcher.cpp

View File

@ -41,10 +41,7 @@
#define QTXMLGLOBAL_H #define QTXMLGLOBAL_H
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#ifndef QT_BOOTSTRAPPED #include <QtXml/qtxml-config.h>
# include <QtXml/qtxml-config.h>
#endif
#include <QtXml/qtxmlexports.h> #include <QtXml/qtxmlexports.h>
#endif // QTXMLGLOBAL_H #endif // QTXMLGLOBAL_H