diff --git a/cmake/Qt3rdPartyLibraryHelpers.cmake b/cmake/Qt3rdPartyLibraryHelpers.cmake
index 924db182bef..c5719a504b2 100644
--- a/cmake/Qt3rdPartyLibraryHelpers.cmake
+++ b/cmake/Qt3rdPartyLibraryHelpers.cmake
@@ -371,6 +371,7 @@ function(qt_internal_add_3rdparty_header_module target)
         INTERNAL_MODULE
         HEADER_MODULE
         NO_CONFIG_HEADER_FILE
+        NO_GENERATE_CPP_EXPORTS
         EXTERNAL_HEADERS ${arg_EXTERNAL_HEADERS}
         EXTERNAL_HEADERS_DIR ${arg_EXTERNAL_HEADERS_DIR}
     )
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake
index d7957fa4bc6..767b7951380 100644
--- a/cmake/QtModuleHelpers.cmake
+++ b/cmake/QtModuleHelpers.cmake
@@ -16,7 +16,6 @@ macro(qt_internal_get_internal_add_module_keywords option_args single_args multi
         NO_ADDITIONAL_TARGET_INFO
         NO_GENERATE_METATYPES
         NO_HEADERSCLEAN_CHECK
-        GENERATE_CPP_EXPORTS # deprecated
         NO_GENERATE_CPP_EXPORTS
         NO_UNITY_BUILD
     )
@@ -423,8 +422,7 @@ function(qt_internal_add_module target)
         # We should not generate export headers if module is defined as pure STATIC.
         # Static libraries don't need to export their symbols, and corner cases when sources are
         # also used in shared libraries, should be handled manually.
-        if((NOT arg_NO_GENERATE_CPP_EXPORTS OR arg_GENERATE_CPP_EXPORTS) AND NOT arg_STATIC
-            AND NOT arg_HEADER_MODULE)
+        if(NOT arg_NO_GENERATE_CPP_EXPORTS AND NOT arg_STATIC AND NOT arg_HEADER_MODULE)
             if(arg_CPP_EXPORT_HEADER_BASE_NAME)
                 set(cpp_export_header_base_name
                     "CPP_EXPORT_HEADER_BASE_NAME;${arg_CPP_EXPORT_HEADER_BASE_NAME}"
diff --git a/src/concurrent/CMakeLists.txt b/src/concurrent/CMakeLists.txt
index 504f8545345..8c852f9ae50 100644
--- a/src/concurrent/CMakeLists.txt
+++ b/src/concurrent/CMakeLists.txt
@@ -37,7 +37,6 @@ qt_internal_add_module(Concurrent
         Qt::CorePrivate
     PRECOMPILED_HEADER
         "../corelib/global/qt_pch.h"
-    GENERATE_CPP_EXPORTS
 )
 
 ## Scopes:
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 1055cf4ab53..68b0bdbcfbd 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -334,7 +334,6 @@ qt_internal_add_module(Core
         WrapZLIB::WrapZLIB
     PRECOMPILED_HEADER
         "global/qt_pch.h"
-    GENERATE_CPP_EXPORTS
     PUBLIC_LIBRARIES
         Qt::Platform
     EXTRA_CMAKE_FILES
diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt
index 9c3f6d23d2c..a3ec0aac22d 100644
--- a/src/dbus/CMakeLists.txt
+++ b/src/dbus/CMakeLists.txt
@@ -54,7 +54,6 @@ qt_internal_add_module(DBus
         Qt::Core
     PRIVATE_MODULE_INTERFACE
         Qt::CorePrivate
-    GENERATE_CPP_EXPORTS
 )
 
 # This file is included by qdbusargument.cpp
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 94cc6867249..af781277058 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -290,7 +290,6 @@ qt_internal_add_module(Gui
         painting/qdrawhelper.cpp
     PRECOMPILED_HEADER
         "kernel/qt_gui_pch.h"
-    GENERATE_CPP_EXPORTS
     QPA_HEADER_FILTERS
         "(^|/)qplatform.+\\.h$|(^|/)qwindowsystem.+\\.h$"
     RHI_HEADER_FILTERS
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 08789d89dec..2e028230bd6 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -76,7 +76,6 @@ qt_internal_add_module(Network
         compat/removed_api.cpp
     PRECOMPILED_HEADER
         "../corelib/global/qt_pch.h"
-    GENERATE_CPP_EXPORTS
 )
 
 ## Scopes:
diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt
index 825e4cb71b5..add246da6e6 100644
--- a/src/opengl/CMakeLists.txt
+++ b/src/opengl/CMakeLists.txt
@@ -49,7 +49,6 @@ qt_internal_add_module(OpenGL
     PRIVATE_MODULE_INTERFACE
         Qt::CorePrivate
         Qt::GuiPrivate
-    GENERATE_CPP_EXPORTS
 )
 
 ## Scopes:
diff --git a/src/openglwidgets/CMakeLists.txt b/src/openglwidgets/CMakeLists.txt
index af3efdf30f7..7325c789518 100644
--- a/src/openglwidgets/CMakeLists.txt
+++ b/src/openglwidgets/CMakeLists.txt
@@ -20,5 +20,4 @@ qt_internal_add_module(OpenGLWidgets
     PUBLIC_LIBRARIES
         Qt::OpenGL
         Qt::Widgets
-    GENERATE_CPP_EXPORTS
 )
diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt
index f6d84be7c29..c24d04d2ce1 100644
--- a/src/printsupport/CMakeLists.txt
+++ b/src/printsupport/CMakeLists.txt
@@ -39,7 +39,6 @@ qt_internal_add_module(PrintSupport
         Qt::CorePrivate
         Qt::GuiPrivate
         Qt::WidgetsPrivate
-    GENERATE_CPP_EXPORTS
     QPA_HEADER_FILTERS
         "(^|/)qplatform.+\\.h$"
 )
diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt
index 0a51f62c4bc..a46f836ffa3 100644
--- a/src/sql/CMakeLists.txt
+++ b/src/sql/CMakeLists.txt
@@ -37,7 +37,6 @@ qt_internal_add_module(Sql
         "compat/removed_api.cpp"
     PRECOMPILED_HEADER
         "../corelib/global/qt_pch.h"
-    GENERATE_CPP_EXPORTS
 )
 
 ## Scopes:
diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt
index e956a47cf12..76643671617 100644
--- a/src/testlib/CMakeLists.txt
+++ b/src/testlib/CMakeLists.txt
@@ -78,7 +78,6 @@ qt_internal_add_module(Test
         Qt::Core
     PRIVATE_MODULE_INTERFACE
         Qt::CorePrivate
-    GENERATE_CPP_EXPORTS
 )
 
 if(TARGET Gui)
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index fdef309a4ae..e20863053d8 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -71,7 +71,6 @@ qt_internal_add_module(Widgets
         "kernel/qt_widgets_pch.h"
     NO_PCH_SOURCES
         compat/removed_api.cpp
-    GENERATE_CPP_EXPORTS
 )
 
 qt_internal_extend_target(Widgets CONDITION APPLE
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index 38b52e3a086..e0c31eeabd9 100644
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -21,7 +21,6 @@ qt_internal_add_module(Xml
         Qt::Core
     PRIVATE_MODULE_INTERFACE
         Qt::CorePrivate
-    GENERATE_CPP_EXPORTS
 )
 
 ## Scopes:
diff --git a/tests/auto/cmake/test_generating_cpp_exports/test_autogenerating_cpp_exports/CMakeLists.txt b/tests/auto/cmake/test_generating_cpp_exports/test_autogenerating_cpp_exports/CMakeLists.txt
index 0e446dd1084..f1cc6906f83 100644
--- a/tests/auto/cmake/test_generating_cpp_exports/test_autogenerating_cpp_exports/CMakeLists.txt
+++ b/tests/auto/cmake/test_generating_cpp_exports/test_autogenerating_cpp_exports/CMakeLists.txt
@@ -3,7 +3,6 @@
 
 qt_internal_add_module(TestAutogeneratingCppExports
     NO_UNITY_BUILD
-    GENERATE_CPP_EXPORTS
     SOURCES
         module_api.h
         module_api.cpp
diff --git a/tests/auto/cmake/test_generating_cpp_exports/test_autogenerating_cpp_exports_custom_name/CMakeLists.txt b/tests/auto/cmake/test_generating_cpp_exports/test_autogenerating_cpp_exports_custom_name/CMakeLists.txt
index 8473979c70d..87a83bd0139 100644
--- a/tests/auto/cmake/test_generating_cpp_exports/test_autogenerating_cpp_exports_custom_name/CMakeLists.txt
+++ b/tests/auto/cmake/test_generating_cpp_exports/test_autogenerating_cpp_exports_custom_name/CMakeLists.txt
@@ -3,7 +3,6 @@
 
 qt_internal_add_module(TestAutogeneratingCppExportsCustomName
     NO_UNITY_BUILD
-    GENERATE_CPP_EXPORTS
     CPP_EXPORT_HEADER_BASE_NAME
         "customname_exports"
     SOURCES