diff options
| author | Joerg Bornemann <[email protected]> | 2022-01-27 14:44:13 +0100 |
|---|---|---|
| committer | Joerg Bornemann <[email protected]> | 2022-02-09 19:49:37 +0100 |
| commit | d03385df9de8715dc97287142dde8882d134cbd1 (patch) | |
| tree | 47a75ef6af1fcfc679404194a86a2ec0d3a40fff | |
| parent | 4fb59234329951b3ea3d252078ff2b8353184d46 (diff) | |
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 <[email protected]>
| -rw-r--r-- | src/corelib/serialization/qxmlstream.cpp | 13 | ||||
| -rw-r--r-- | src/tools/bootstrap/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/xml/qtxmlglobal.h | 5 |
3 files changed, 1 insertions, 20 deletions
diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp index 68c06eb0bd6..ed9a3233d10 100644 --- a/src/corelib/serialization/qxmlstream.cpp +++ b/src/corelib/serialization/qxmlstream.cpp @@ -49,20 +49,7 @@ #include <qstack.h> #include <qbuffer.h> #include <qscopeguard.h> -#ifndef QT_BOOTSTRAPPED #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 "qxmlstream_p.h" diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index ca768e8560d..5bf537edc4e 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -64,9 +64,6 @@ qt_internal_extend_target(Bootstrap ../../corelib/serialization/qjsonvalue.cpp ../../corelib/serialization/qjsonwriter.cpp ../../corelib/serialization/qtextstream.cpp - ../../corelib/serialization/qxmlstream.cpp - ../../corelib/serialization/qxmlstreamgrammar.cpp - ../../corelib/serialization/qxmlutils.cpp ../../corelib/text/qbytearray.cpp ../../corelib/text/qbytearraylist.cpp ../../corelib/text/qbytearraymatcher.cpp diff --git a/src/xml/qtxmlglobal.h b/src/xml/qtxmlglobal.h index 9ad9dd4af1b..3c8151ba10d 100644 --- a/src/xml/qtxmlglobal.h +++ b/src/xml/qtxmlglobal.h @@ -41,10 +41,7 @@ #define QTXMLGLOBAL_H #include <QtCore/qglobal.h> -#ifndef QT_BOOTSTRAPPED -# include <QtXml/qtxml-config.h> -#endif - +#include <QtXml/qtxml-config.h> #include <QtXml/qtxmlexports.h> #endif // QTXMLGLOBAL_H |