diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 48aba27ca3..f92e3a8660 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -248,6 +248,7 @@ qt_internal_add_module(Core
     DEFINES
         QT_NO_FOREACH
         QT_NO_USING_NAMESPACE
+        QT_TYPESAFE_FLAGS
     INCLUDE_DIRECTORIES
         "${CMAKE_CURRENT_BINARY_DIR}/global" # special case
         "${CMAKE_CURRENT_BINARY_DIR}/kernel" # for moc_qobject.cpp to be found by qobject.cpp
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
index 31bbd7c2e1..89ff6c2c76 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -99,6 +99,7 @@ qt_internal_extend_target(Bootstrap
         ../../xml/dom/qdom.cpp
     DEFINES
         HAVE_CONFIG_H
+        QT_TYPESAFE_FLAGS
     PUBLIC_DEFINES # special case
         QT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} # special case
         QT_VERSION_MINOR=${PROJECT_VERSION_MINOR} # special case