3 files changed, 16 insertions, 3 deletions
diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt
index d66ef7a6a1..b42582efd8 100644
--- a/src/tools/bootstrap/.prev_CMakeLists.txt
+++ b/src/tools/bootstrap/.prev_CMakeLists.txt
@@ -105,7 +105,6 @@ qt_add_module(Bootstrap
         ../../corelib/text/qlocale_tools.cpp
         ../../corelib/text/qregularexpression.cpp
         ../../corelib/text/qstring.cpp
-        ../../corelib/text/qstring_compat.cpp
         ../../corelib/text/qstringbuilder.cpp
         ../../corelib/text/qstringconverter.cpp
         ../../corelib/text/qstringlist.cpp
@@ -121,14 +120,12 @@ qt_add_module(Bootstrap
         ../../corelib/tools/qcryptographichash.cpp
         ../../corelib/tools/qhash.cpp
         ../../corelib/tools/qline.cpp
-        ../../corelib/tools/qmap.cpp
         ../../corelib/tools/qpoint.cpp
         ../../corelib/tools/qrect.cpp
         ../../corelib/tools/qringbuffer.cpp
         ../../corelib/tools/qsize.cpp
         ../../corelib/tools/qversionnumber.cpp
         ../../xml/dom/qdom.cpp
-        ../../xml/sax/qxml.cpp
     DEFINES
         HAVE_CONFIG_H
         PCRE2_CODE_UNIT_WIDTH=16
diff --git a/src/tools/moc/.prev_CMakeLists.txt b/src/tools/moc/.prev_CMakeLists.txt
index e6004cefca..f3688020f6 100644
--- a/src/tools/moc/.prev_CMakeLists.txt
+++ b/src/tools/moc/.prev_CMakeLists.txt
@@ -35,3 +35,11 @@ qt_add_tool(${target_name}
 #### Keys ignored in scope 1:.:.:moc.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "Qt Meta Object Compiler"
 # _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(${target_name} CONDITION MSVC
+    DEFINES
+        _CRT_SECURE_NO_WARNINGS
+)
diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt
index 0073acf319..91c9d89cea 100644
--- a/src/tools/moc/CMakeLists.txt
+++ b/src/tools/moc/CMakeLists.txt
@@ -36,3 +36,11 @@ qt_add_tool(${target_name}
 #### Keys ignored in scope 1:.:.:moc.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "Qt Meta Object Compiler"
 # _OPTION = "host_build"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(${target_name} CONDITION MSVC
+    DEFINES
+        _CRT_SECURE_NO_WARNINGS
+)