Remove the use of GENERATE_PRIVATE_CPP_EXPORTS

Task-number: QTBUG-117983
Change-Id: I584116bfd4d47deca914910b712c2ea3295f3e7f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

27 files changed, 27 insertions, 54 deletions

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index dd46d02b20..1446f9844e 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -21,8 +21,7 @@ qt_internal_add_qml_module(QmlCore
         Qt::Core
         Qt::Qml
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
 
 qt_internal_extend_target(QmlCore CONDITION QT_FEATURE_settings
     SOURCES
diff --git a/src/effects/CMakeLists.txt b/src/effects/CMakeLists.txt
index e1be2fe9e9..5546c29ed0 100644
--- a/src/effects/CMakeLists.txt
+++ b/src/effects/CMakeLists.txt
@@ -26,8 +26,7 @@ qt_internal_add_qml_module(QuickEffectsPrivate
         Qt::QmlPrivate
         Qt::QuickPrivate
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
 
 qt_internal_add_resource(QuickEffectsPrivate "effects"
     PREFIX
diff --git a/src/labs/animation/CMakeLists.txt b/src/labs/animation/CMakeLists.txt
index b54a4bf5e7..57fd2bb170 100644
--- a/src/labs/animation/CMakeLists.txt
+++ b/src/labs/animation/CMakeLists.txt
@@ -17,5 +17,4 @@ qt_internal_add_qml_module(LabsAnimation
         Qt::QmlPrivate
         Qt::QuickPrivate
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
diff --git a/src/labs/folderlistmodel/CMakeLists.txt b/src/labs/folderlistmodel/CMakeLists.txt
index b403097045..bcb7b7d94f 100644
--- a/src/labs/folderlistmodel/CMakeLists.txt
+++ b/src/labs/folderlistmodel/CMakeLists.txt
@@ -20,5 +20,4 @@ qt_internal_add_qml_module(LabsFolderListModel
         Qt::QmlPrivate
         Qt::QmlModelsPrivate
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
diff --git a/src/labs/models/CMakeLists.txt b/src/labs/models/CMakeLists.txt
index 3ff03fb0cd..6c6697a5a5 100644
--- a/src/labs/models/CMakeLists.txt
+++ b/src/labs/models/CMakeLists.txt
@@ -16,8 +16,7 @@ qt_internal_add_qml_module(LabsQmlModels
     DEPENDENCIES
         QtQml.Models/auto
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
 
 qt_internal_extend_target(LabsQmlModels CONDITION QT_FEATURE_qml_table_model
     SOURCES
diff --git a/src/labs/settings/CMakeLists.txt b/src/labs/settings/CMakeLists.txt
index 3e703c9146..d9d53fab24 100644
--- a/src/labs/settings/CMakeLists.txt
+++ b/src/labs/settings/CMakeLists.txt
@@ -15,5 +15,4 @@ qt_internal_add_qml_module(LabsSettings
          Qt::Core
          Qt::Qml
      GENERATE_CPP_EXPORTS
-     GENERATE_PRIVATE_CPP_EXPORTS
-)
+     )
diff --git a/src/labs/sharedimage/CMakeLists.txt b/src/labs/sharedimage/CMakeLists.txt
index 65f31ac016..8cbe5b62cc 100644
--- a/src/labs/sharedimage/CMakeLists.txt
+++ b/src/labs/sharedimage/CMakeLists.txt
@@ -20,8 +20,7 @@ qt_internal_add_qml_module(LabsSharedImage
         Qt::GuiPrivate
         Qt::QuickPrivate
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
 
 # We need to do additional initialization, so we have to provide our own
 # plugin class rather than using the generated one
diff --git a/src/labs/wavefrontmesh/CMakeLists.txt b/src/labs/wavefrontmesh/CMakeLists.txt
index 1c99d35cac..eb68fa2947 100644
--- a/src/labs/wavefrontmesh/CMakeLists.txt
+++ b/src/labs/wavefrontmesh/CMakeLists.txt
@@ -18,5 +18,4 @@ qt_internal_add_qml_module(LabsWavefrontMesh
         Qt::GuiPrivate
         Qt::QuickPrivate
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt
index 61a9c536ff..e07fe76067 100644
--- a/src/particles/CMakeLists.txt
+++ b/src/particles/CMakeLists.txt
@@ -64,8 +64,7 @@ qt_internal_add_qml_module(QuickParticlesPrivate
         Qt::QmlPrivate
         Qt::QuickPrivate
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
 
 # Resources:
 set(particles_resource_files
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index c6136f27f1..3927a77e0c 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -495,8 +495,7 @@ qt_internal_add_qml_module(Qml
         "${INSTALL_CMAKE_NAMESPACE}QmlFindQmlscInternal.cmake"
         ${extra_cmake_includes}
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-    POLICIES
+        POLICIES
         QTP0001
 )
 
diff --git a/src/qmlcompiler/CMakeLists.txt b/src/qmlcompiler/CMakeLists.txt
index 03903f4e65..1fd1299d5e 100644
--- a/src/qmlcompiler/CMakeLists.txt
+++ b/src/qmlcompiler/CMakeLists.txt
@@ -7,8 +7,7 @@
 
 qt_internal_add_module(QmlCompiler
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-    PLUGIN_TYPES qmllint
+        PLUGIN_TYPES qmllint
     SOURCES
         qcoloroutput_p.h qcoloroutput.cpp
         qdeferredpointer_p.h
diff --git a/src/qmllocalstorage/CMakeLists.txt b/src/qmllocalstorage/CMakeLists.txt
index 63ecdcec29..8a67f14766 100644
--- a/src/qmllocalstorage/CMakeLists.txt
+++ b/src/qmllocalstorage/CMakeLists.txt
@@ -16,5 +16,4 @@ qt_internal_add_qml_module(QmlLocalStorage
         Qt::QmlPrivate
         Qt::Sql
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
diff --git a/src/qmlls/CMakeLists.txt b/src/qmlls/CMakeLists.txt
index 50ba7ba42e..725af420bc 100644
--- a/src/qmlls/CMakeLists.txt
+++ b/src/qmlls/CMakeLists.txt
@@ -34,5 +34,4 @@ qt_internal_add_module(QmlLSPrivate
         Qt::QmlToolingSettingsPrivate
         Qt::LanguageServerPrivate
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt
index 6c33b1e81c..18ae5ceeff 100644
--- a/src/qmlmodels/CMakeLists.txt
+++ b/src/qmlmodels/CMakeLists.txt
@@ -31,8 +31,7 @@ qt_internal_add_qml_module(QmlModels
         Qt::CorePrivate
         Qt::QmlPrivate
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
 
 qt_internal_extend_target(QmlModels CONDITION QT_FEATURE_qml_itemmodel
     SOURCES
diff --git a/src/qmlnetwork/CMakeLists.txt b/src/qmlnetwork/CMakeLists.txt
index 777cbb737b..2e9978703b 100644
--- a/src/qmlnetwork/CMakeLists.txt
+++ b/src/qmlnetwork/CMakeLists.txt
@@ -15,8 +15,7 @@ qt_internal_add_qml_module(QmlNetwork
         Qt::Network
         Qt::Qml
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
 
 qt_internal_extend_target(QmlNetwork CONDITION QT_FEATURE_qml_ssl
     SOURCES
diff --git a/src/qmltoolingsettings/CMakeLists.txt b/src/qmltoolingsettings/CMakeLists.txt
index d6a19b5412..ebc6d8a107 100644
--- a/src/qmltoolingsettings/CMakeLists.txt
+++ b/src/qmltoolingsettings/CMakeLists.txt
@@ -10,5 +10,4 @@ qt_internal_add_module(QmlToolingSettingsPrivate
     PUBLIC_LIBRARIES
         Qt::Core
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
diff --git a/src/qmltyperegistrar/CMakeLists.txt b/src/qmltyperegistrar/CMakeLists.txt
index 89c1ef5c75..7b17e8ddba 100644
--- a/src/qmltyperegistrar/CMakeLists.txt
+++ b/src/qmltyperegistrar/CMakeLists.txt
@@ -25,8 +25,7 @@ qt_internal_add_module(QmlTypeRegistrarPrivate
     PUBLIC_LIBRARIES
         Qt::CorePrivate
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
 
 qt_internal_add_resource(QmlTypeRegistrarPrivate "jsRootMetaTypes"
     PREFIX
diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt
index 3c6e53b839..1704d5ae16 100644
--- a/src/qmlworkerscript/CMakeLists.txt
+++ b/src/qmlworkerscript/CMakeLists.txt
@@ -54,8 +54,7 @@ qt_internal_add_qml_module(QmlWorkerScript
         Qt::CorePrivate
         Qt::QmlPrivate
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
 
 qt_internal_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
     DEFINES
diff --git a/src/qmlxmllistmodel/CMakeLists.txt b/src/qmlxmllistmodel/CMakeLists.txt
index 148c7e1099..3237ba891a 100644
--- a/src/qmlxmllistmodel/CMakeLists.txt
+++ b/src/qmlxmllistmodel/CMakeLists.txt
@@ -22,8 +22,7 @@ qt_internal_add_qml_module(QmlXmlListModel
     PRIVATE_MODULE_INTERFACE
         Qt::CorePrivate
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
 
 qt_internal_add_docs(QmlXmlListModel
     doc/qtqmlxmllistmodel.qdocconf
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index 2ba1d560a6..1b0b2519fb 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -248,8 +248,7 @@ qt_internal_add_qml_module(Quick
         Qt::QmlModelsPrivate
         Qt::QmlPrivate
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
 
 # We need to do additional initialization, so we have to provide our own
 # plugin class rather than using the generated one
diff --git a/src/quickcontrolsimpl/CMakeLists.txt b/src/quickcontrolsimpl/CMakeLists.txt
index acbc91b15e..6bc7d566fc 100644
--- a/src/quickcontrolsimpl/CMakeLists.txt
+++ b/src/quickcontrolsimpl/CMakeLists.txt
@@ -46,8 +46,7 @@ qt_internal_add_qml_module(QuickControls2Impl
         Qt::Gui
         Qt::Quick
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
 
 qt_internal_extend_target(QuickControls2Impl CONDITION QT_FEATURE_quick_listview AND QT_FEATURE_quick_pathview
     SOURCES
diff --git a/src/quickdialogs/quickdialogs/CMakeLists.txt b/src/quickdialogs/quickdialogs/CMakeLists.txt
index b13f9a6a9e..ec9c37c2f9 100644
--- a/src/quickdialogs/quickdialogs/CMakeLists.txt
+++ b/src/quickdialogs/quickdialogs/CMakeLists.txt
@@ -50,8 +50,7 @@ qt_internal_add_qml_module(QuickDialogs2
         Qt::Gui
         Qt::Quick
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
 
 qt_internal_add_docs(QuickDialogs2
     doc/qtquickdialogs.qdocconf
diff --git a/src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt b/src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt
index 224260f14a..3d88ba63d7 100644
--- a/src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt
+++ b/src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt
@@ -112,8 +112,7 @@ qt_internal_add_qml_module(QuickDialogs2QuickImpl
         Qt::Gui
         Qt::Quick
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
 
 qt_internal_extend_target(QuickDialogs2QuickImpl CONDITION QT_FEATURE_quick_listview
     SOURCES
diff --git a/src/quickdialogs/quickdialogsutils/CMakeLists.txt b/src/quickdialogs/quickdialogsutils/CMakeLists.txt
index 32c175241b..bcf54b279c 100644
--- a/src/quickdialogs/quickdialogsutils/CMakeLists.txt
+++ b/src/quickdialogs/quickdialogsutils/CMakeLists.txt
@@ -25,5 +25,4 @@ qt_internal_add_module(QuickDialogs2Utils
     PUBLIC_LIBRARIES
         Qt::Core
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
diff --git a/src/quicklayouts/CMakeLists.txt b/src/quicklayouts/CMakeLists.txt
index 18d7366412..4eeb697461 100644
--- a/src/quicklayouts/CMakeLists.txt
+++ b/src/quicklayouts/CMakeLists.txt
@@ -25,5 +25,4 @@ qt_internal_add_qml_module(QuickLayouts
         Qt::QuickPrivate
         Qt::Qml
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt
index 27bf3d4e5b..95d8d6717f 100644
--- a/src/quickshapes/CMakeLists.txt
+++ b/src/quickshapes/CMakeLists.txt
@@ -28,8 +28,7 @@ qt_internal_add_qml_module(QuickShapesPrivate
         Qt::Qml
         Qt::QuickPrivate
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
 
 # We need to do additional initialization, so we have to provide our own
 # plugin class rather than using the generated one
diff --git a/src/quicktemplates/CMakeLists.txt b/src/quicktemplates/CMakeLists.txt
index 067d3c1134..441649a46a 100644
--- a/src/quicktemplates/CMakeLists.txt
+++ b/src/quicktemplates/CMakeLists.txt
@@ -116,8 +116,7 @@ qt_internal_add_qml_module(QuickTemplates2
         Qt::Gui
         Qt::Quick
     GENERATE_CPP_EXPORTS
-    GENERATE_PRIVATE_CPP_EXPORTS
-)
+    )
 
 qt_internal_extend_target(QuickTemplates2 CONDITION TARGET Qt::QmlModels
     LIBRARIES