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 #include #include -#ifndef QT_BOOTSTRAPPED #include -#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 #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 -#ifndef QT_BOOTSTRAPPED -# include -#endif - +#include #include #endif // QTXMLGLOBAL_H