4 files changed, 5 insertions, 3 deletions
diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h
index 7922a3993a7..85c7117726e 100644
--- a/src/corelib/kernel/qmetatype_p.h
+++ b/src/corelib/kernel/qmetatype_p.h
@@ -67,6 +67,7 @@ struct TypeDefinition
 
 // Ignore these types, as incomplete
 #ifdef QT_BOOTSTRAPPED
+template<> struct TypeDefinition<qfloat16> { static const bool IsAvailable = false; };
 template<> struct TypeDefinition<QBitArray> { static const bool IsAvailable = false; };
 template<> struct TypeDefinition<QByteArrayList> { static const bool IsAvailable = false; };
 template<> struct TypeDefinition<QCborArray> { static const bool IsAvailable = false; };
diff --git a/src/corelib/serialization/qcborstreamwriter.cpp b/src/corelib/serialization/qcborstreamwriter.cpp
index 7b5099567ee..713b4116661 100644
--- a/src/corelib/serialization/qcborstreamwriter.cpp
+++ b/src/corelib/serialization/qcborstreamwriter.cpp
@@ -277,6 +277,7 @@ QCborStreamWriter::QCborStreamWriter(QIODevice *device)
 {
 }
 
+#ifndef QT_BOOTSTRAPPED
 /*!
    Creates a QCborStreamWriter object that will append the stream to \a data.
    All streaming is done immediately to the byte array, without the need for
@@ -295,6 +296,7 @@ QCborStreamWriter::QCborStreamWriter(QByteArray *data)
     d->deleteDevice = true;
     d->device->open(QIODevice::WriteOnly | QIODevice::Unbuffered);
 }
+#endif
 
 /*!
    Destroys this QCborStreamWriter object and frees any resources associated.
diff --git a/src/corelib/serialization/qtextstream.cpp b/src/corelib/serialization/qtextstream.cpp
index 13a8d20a305..501ee3a5efa 100644
--- a/src/corelib/serialization/qtextstream.cpp
+++ b/src/corelib/serialization/qtextstream.cpp
@@ -936,6 +936,7 @@ QTextStream::QTextStream(QString *string, OpenMode openMode)
     d->status = Ok;
 }
 
+#ifndef QT_BOOTSTRAPPED
 /*!
     Constructs a QTextStream that operates on \a array, using \a
     openMode to define the open mode. Internally, the array is wrapped
@@ -987,6 +988,7 @@ QTextStream::QTextStream(const QByteArray &array, OpenMode openMode)
 #endif
     d->status = Ok;
 }
+#endif
 
 /*!
     Constructs a QTextStream that operates on \a fileHandle, using \a
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
index fdcf2a04fbd..a5045bc30f7 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -18,12 +18,9 @@ qt_internal_add_sync_header_dependencies(Bootstrap Core)
 qt_internal_extend_target(Bootstrap
     SOURCES
         ../../corelib/global/qassert.cpp
-        ../../corelib/global/qfloat16.cpp
         ../../corelib/global/qlogging.cpp
-        ../../corelib/global/qmalloc.cpp
         ../../corelib/global/qtenvironmentvariables.cpp
         ../../corelib/io/qabstractfileengine.cpp
-        ../../corelib/io/qbuffer.cpp
         ../../corelib/io/qdebug.cpp
         ../../corelib/io/qdir.cpp
         ../../corelib/io/qfile.cpp