aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Edelev <[email protected]>2024-06-10 17:19:23 +0200
committerAlexey Edelev <[email protected]>2024-06-11 22:53:08 +0200
commit180f13fdfd7e7c83fa4d0427a7b7068375bf15e0 (patch)
tree0848fce2711362555ab1814bf1d173bde31926ea
parent59000e6806e0f799f9ee350fc2a5e1519d4021d9 (diff)
Remove the use of GENERATE_CPP_EXPORTS argument
The behavior that argument was enabling is the default one now. Pick-to: 6.8 Task-number: QTBUG-90492 Change-Id: I11711d4c794f0b22169abb595b8ffad2eeb1300d Reviewed-by: Alexandru Croitor <[email protected]>
-rw-r--r--src/core/CMakeLists.txt1
-rw-r--r--src/effects/CMakeLists.txt1
-rw-r--r--src/labs/animation/CMakeLists.txt1
-rw-r--r--src/labs/folderlistmodel/CMakeLists.txt1
-rw-r--r--src/labs/models/CMakeLists.txt1
-rw-r--r--src/labs/settings/CMakeLists.txt1
-rw-r--r--src/labs/sharedimage/CMakeLists.txt1
-rw-r--r--src/labs/wavefrontmesh/CMakeLists.txt1
-rw-r--r--src/particles/CMakeLists.txt1
-rw-r--r--src/qml/CMakeLists.txt2
-rw-r--r--src/qmlcompiler/CMakeLists.txt1
-rw-r--r--src/qmllocalstorage/CMakeLists.txt1
-rw-r--r--src/qmlls/CMakeLists.txt1
-rw-r--r--src/qmlmodels/CMakeLists.txt1
-rw-r--r--src/qmlnetwork/CMakeLists.txt1
-rw-r--r--src/qmltest/CMakeLists.txt1
-rw-r--r--src/qmltoolingsettings/CMakeLists.txt1
-rw-r--r--src/qmltyperegistrar/CMakeLists.txt1
-rw-r--r--src/qmlworkerscript/CMakeLists.txt1
-rw-r--r--src/qmlxmllistmodel/CMakeLists.txt1
-rw-r--r--src/quick/CMakeLists.txt1
-rw-r--r--src/quickcontrols/CMakeLists.txt1
-rw-r--r--src/quickcontrols/basic/CMakeLists.txt1
-rw-r--r--src/quickcontrols/fusion/CMakeLists.txt1
-rw-r--r--src/quickcontrols/imagine/CMakeLists.txt1
-rw-r--r--src/quickcontrols/material/CMakeLists.txt1
-rw-r--r--src/quickcontrols/universal/CMakeLists.txt1
-rw-r--r--src/quickcontrolsimpl/CMakeLists.txt1
-rw-r--r--src/quickdialogs/quickdialogs/CMakeLists.txt1
-rw-r--r--src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt1
-rw-r--r--src/quickdialogs/quickdialogsutils/CMakeLists.txt1
-rw-r--r--src/quicklayouts/CMakeLists.txt1
-rw-r--r--src/quickshapes/CMakeLists.txt1
-rw-r--r--src/quicktemplates/CMakeLists.txt1
-rw-r--r--src/quickvectorimage/CMakeLists.txt2
-rw-r--r--src/quickwidgets/CMakeLists.txt1
36 files changed, 0 insertions, 38 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 1446f9844e..90a4c9f786 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -20,7 +20,6 @@ qt_internal_add_qml_module(QmlCore
PUBLIC_LIBRARIES
Qt::Core
Qt::Qml
- GENERATE_CPP_EXPORTS
)
qt_internal_extend_target(QmlCore CONDITION QT_FEATURE_settings
diff --git a/src/effects/CMakeLists.txt b/src/effects/CMakeLists.txt
index f461116818..85e4b3c514 100644
--- a/src/effects/CMakeLists.txt
+++ b/src/effects/CMakeLists.txt
@@ -25,7 +25,6 @@ qt_internal_add_qml_module(QuickEffectsPrivate
Qt::GuiPrivate
Qt::QmlPrivate
Qt::QuickPrivate
- GENERATE_CPP_EXPORTS
)
qt_internal_add_resource(QuickEffectsPrivate "effects"
diff --git a/src/labs/animation/CMakeLists.txt b/src/labs/animation/CMakeLists.txt
index 57fd2bb170..bf8e41b7e2 100644
--- a/src/labs/animation/CMakeLists.txt
+++ b/src/labs/animation/CMakeLists.txt
@@ -16,5 +16,4 @@ qt_internal_add_qml_module(LabsAnimation
PUBLIC_LIBRARIES
Qt::QmlPrivate
Qt::QuickPrivate
- GENERATE_CPP_EXPORTS
)
diff --git a/src/labs/folderlistmodel/CMakeLists.txt b/src/labs/folderlistmodel/CMakeLists.txt
index bcb7b7d94f..e0851ee203 100644
--- a/src/labs/folderlistmodel/CMakeLists.txt
+++ b/src/labs/folderlistmodel/CMakeLists.txt
@@ -19,5 +19,4 @@ qt_internal_add_qml_module(LabsFolderListModel
Qt::CorePrivate
Qt::QmlPrivate
Qt::QmlModelsPrivate
- GENERATE_CPP_EXPORTS
)
diff --git a/src/labs/models/CMakeLists.txt b/src/labs/models/CMakeLists.txt
index 6c6697a5a5..0ae2d7d16e 100644
--- a/src/labs/models/CMakeLists.txt
+++ b/src/labs/models/CMakeLists.txt
@@ -15,7 +15,6 @@ qt_internal_add_qml_module(LabsQmlModels
Qt::QmlPrivate
DEPENDENCIES
QtQml.Models/auto
- GENERATE_CPP_EXPORTS
)
qt_internal_extend_target(LabsQmlModels CONDITION QT_FEATURE_qml_table_model
diff --git a/src/labs/settings/CMakeLists.txt b/src/labs/settings/CMakeLists.txt
index d9d53fab24..6b14e97443 100644
--- a/src/labs/settings/CMakeLists.txt
+++ b/src/labs/settings/CMakeLists.txt
@@ -14,5 +14,4 @@ qt_internal_add_qml_module(LabsSettings
PUBLIC_LIBRARIES
Qt::Core
Qt::Qml
- GENERATE_CPP_EXPORTS
)
diff --git a/src/labs/sharedimage/CMakeLists.txt b/src/labs/sharedimage/CMakeLists.txt
index 8cbe5b62cc..d551bdf5cb 100644
--- a/src/labs/sharedimage/CMakeLists.txt
+++ b/src/labs/sharedimage/CMakeLists.txt
@@ -19,7 +19,6 @@ qt_internal_add_qml_module(LabsSharedImage
Qt::CorePrivate
Qt::GuiPrivate
Qt::QuickPrivate
- GENERATE_CPP_EXPORTS
)
# We need to do additional initialization, so we have to provide our own
diff --git a/src/labs/wavefrontmesh/CMakeLists.txt b/src/labs/wavefrontmesh/CMakeLists.txt
index eb68fa2947..5b0bdde643 100644
--- a/src/labs/wavefrontmesh/CMakeLists.txt
+++ b/src/labs/wavefrontmesh/CMakeLists.txt
@@ -17,5 +17,4 @@ qt_internal_add_qml_module(LabsWavefrontMesh
Qt::CorePrivate
Qt::GuiPrivate
Qt::QuickPrivate
- GENERATE_CPP_EXPORTS
)
diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt
index 9746349d81..7516f23b21 100644
--- a/src/particles/CMakeLists.txt
+++ b/src/particles/CMakeLists.txt
@@ -63,7 +63,6 @@ qt_internal_add_qml_module(QuickParticlesPrivate
Qt::GuiPrivate
Qt::QmlPrivate
Qt::QuickPrivate
- GENERATE_CPP_EXPORTS
)
# Resources:
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index b52a734bd5..5ed8abf904 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -445,7 +445,6 @@ qt_internal_add_qml_module(Qml
EXTRA_CMAKE_INCLUDES
"${INSTALL_CMAKE_NAMESPACE}QmlFindQmlscInternal.cmake"
${extra_cmake_includes}
- GENERATE_CPP_EXPORTS
POLICIES
QTP0001
QTP0004
@@ -520,7 +519,6 @@ qt_internal_add_qml_module(QmlMeta
LIBRARIES
Qml
QmlModels
- GENERATE_CPP_EXPORTS
)
add_dependencies(QmlMeta BuiltinsOutput)
diff --git a/src/qmlcompiler/CMakeLists.txt b/src/qmlcompiler/CMakeLists.txt
index 445e5c7c12..663a0d69a3 100644
--- a/src/qmlcompiler/CMakeLists.txt
+++ b/src/qmlcompiler/CMakeLists.txt
@@ -6,7 +6,6 @@
#####################################################################
qt_internal_add_module(QmlCompiler
- GENERATE_CPP_EXPORTS
PLUGIN_TYPES qmllint
SOURCES
qcoloroutput_p.h qcoloroutput.cpp
diff --git a/src/qmllocalstorage/CMakeLists.txt b/src/qmllocalstorage/CMakeLists.txt
index 8a67f14766..0517b2231a 100644
--- a/src/qmllocalstorage/CMakeLists.txt
+++ b/src/qmllocalstorage/CMakeLists.txt
@@ -15,5 +15,4 @@ qt_internal_add_qml_module(QmlLocalStorage
Qt::CorePrivate
Qt::QmlPrivate
Qt::Sql
- GENERATE_CPP_EXPORTS
)
diff --git a/src/qmlls/CMakeLists.txt b/src/qmlls/CMakeLists.txt
index 2061f5cebe..b15fb396f8 100644
--- a/src/qmlls/CMakeLists.txt
+++ b/src/qmlls/CMakeLists.txt
@@ -43,5 +43,4 @@ qt_internal_add_module(QmlLSPrivate
Qt::QmlCompilerPrivate
Qt::QmlToolingSettingsPrivate
Qt::LanguageServerPrivate
- GENERATE_CPP_EXPORTS
)
diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt
index 9a9202e6ed..510143bb74 100644
--- a/src/qmlmodels/CMakeLists.txt
+++ b/src/qmlmodels/CMakeLists.txt
@@ -30,7 +30,6 @@ qt_internal_add_qml_module(QmlModels
PRIVATE_MODULE_INTERFACE
Qt::CorePrivate
Qt::QmlPrivate
- GENERATE_CPP_EXPORTS
)
qt_internal_extend_target(QmlModels CONDITION QT_FEATURE_qml_itemmodel
diff --git a/src/qmlnetwork/CMakeLists.txt b/src/qmlnetwork/CMakeLists.txt
index 2e9978703b..697219b648 100644
--- a/src/qmlnetwork/CMakeLists.txt
+++ b/src/qmlnetwork/CMakeLists.txt
@@ -14,7 +14,6 @@ qt_internal_add_qml_module(QmlNetwork
Qt::Core
Qt::Network
Qt::Qml
- GENERATE_CPP_EXPORTS
)
qt_internal_extend_target(QmlNetwork CONDITION QT_FEATURE_qml_ssl
diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt
index 51fd6648ca..f42d6cc44b 100644
--- a/src/qmltest/CMakeLists.txt
+++ b/src/qmltest/CMakeLists.txt
@@ -49,7 +49,6 @@ qt_internal_add_qml_module(QuickTest
Qt::Test
PRIVATE_MODULE_INTERFACE
Qt::TestPrivate
- GENERATE_CPP_EXPORTS
)
qt_internal_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
diff --git a/src/qmltoolingsettings/CMakeLists.txt b/src/qmltoolingsettings/CMakeLists.txt
index 8776a6dd98..f5e456cd96 100644
--- a/src/qmltoolingsettings/CMakeLists.txt
+++ b/src/qmltoolingsettings/CMakeLists.txt
@@ -12,5 +12,4 @@ qt_internal_add_module(QmlToolingSettingsPrivate
qqmltoolingutils.cpp
PUBLIC_LIBRARIES
Qt::Core
- GENERATE_CPP_EXPORTS
)
diff --git a/src/qmltyperegistrar/CMakeLists.txt b/src/qmltyperegistrar/CMakeLists.txt
index 7b17e8ddba..e1f2b48719 100644
--- a/src/qmltyperegistrar/CMakeLists.txt
+++ b/src/qmltyperegistrar/CMakeLists.txt
@@ -24,7 +24,6 @@ qt_internal_add_module(QmlTypeRegistrarPrivate
QT_NO_CAST_TO_ASCII
PUBLIC_LIBRARIES
Qt::CorePrivate
- GENERATE_CPP_EXPORTS
)
qt_internal_add_resource(QmlTypeRegistrarPrivate "jsRootMetaTypes"
diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt
index 93e97834b6..cb1643c6f5 100644
--- a/src/qmlworkerscript/CMakeLists.txt
+++ b/src/qmlworkerscript/CMakeLists.txt
@@ -53,7 +53,6 @@ qt_internal_add_qml_module(QmlWorkerScript
PRIVATE_MODULE_INTERFACE
Qt::CorePrivate
Qt::QmlPrivate
- GENERATE_CPP_EXPORTS
)
qt_internal_extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
diff --git a/src/qmlxmllistmodel/CMakeLists.txt b/src/qmlxmllistmodel/CMakeLists.txt
index 3237ba891a..5b56f6388b 100644
--- a/src/qmlxmllistmodel/CMakeLists.txt
+++ b/src/qmlxmllistmodel/CMakeLists.txt
@@ -21,7 +21,6 @@ qt_internal_add_qml_module(QmlXmlListModel
Qt::Qml
PRIVATE_MODULE_INTERFACE
Qt::CorePrivate
- GENERATE_CPP_EXPORTS
)
qt_internal_add_docs(QmlXmlListModel
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index d422d7e20b..6f294d30d1 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -250,7 +250,6 @@ qt_internal_add_qml_module(Quick
Qt::QmlModelsPrivate
Qt::QmlPrivate
Qt::QmlMetaPrivate
- GENERATE_CPP_EXPORTS
)
# We need to do additional initialization, so we have to provide our own
diff --git a/src/quickcontrols/CMakeLists.txt b/src/quickcontrols/CMakeLists.txt
index ea98c45908..1a5160a405 100644
--- a/src/quickcontrols/CMakeLists.txt
+++ b/src/quickcontrols/CMakeLists.txt
@@ -44,7 +44,6 @@ qt_internal_add_qml_module(QuickControls2
Qt::Core
Qt::Gui
Qt::Quick
- GENERATE_CPP_EXPORTS
)
qt_internal_extend_target(qtquickcontrols2plugin
diff --git a/src/quickcontrols/basic/CMakeLists.txt b/src/quickcontrols/basic/CMakeLists.txt
index a9ed8f1f2a..b5aa4a7fbb 100644
--- a/src/quickcontrols/basic/CMakeLists.txt
+++ b/src/quickcontrols/basic/CMakeLists.txt
@@ -177,7 +177,6 @@ qt_internal_add_qml_module(QuickControls2Basic
Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
- GENERATE_CPP_EXPORTS
)
target_sources(qtquickcontrols2basicstyleplugin
diff --git a/src/quickcontrols/fusion/CMakeLists.txt b/src/quickcontrols/fusion/CMakeLists.txt
index 572a3cf931..0c751db621 100644
--- a/src/quickcontrols/fusion/CMakeLists.txt
+++ b/src/quickcontrols/fusion/CMakeLists.txt
@@ -122,7 +122,6 @@ qt_internal_add_qml_module(QuickControls2Fusion
Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
- GENERATE_CPP_EXPORTS
)
target_sources(qtquickcontrols2fusionstyleplugin
diff --git a/src/quickcontrols/imagine/CMakeLists.txt b/src/quickcontrols/imagine/CMakeLists.txt
index a029e09e82..5d57d51470 100644
--- a/src/quickcontrols/imagine/CMakeLists.txt
+++ b/src/quickcontrols/imagine/CMakeLists.txt
@@ -114,7 +114,6 @@ qt_internal_add_qml_module(QuickControls2Imagine
Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
- GENERATE_CPP_EXPORTS
)
target_sources(qtquickcontrols2imaginestyleplugin
diff --git a/src/quickcontrols/material/CMakeLists.txt b/src/quickcontrols/material/CMakeLists.txt
index a427b3711c..0c7416ea7f 100644
--- a/src/quickcontrols/material/CMakeLists.txt
+++ b/src/quickcontrols/material/CMakeLists.txt
@@ -125,7 +125,6 @@ qt_internal_add_qml_module(QuickControls2Material
Qt::QuickControls2Private
Qt::QuickPrivate
Qt::QuickTemplates2Private
- GENERATE_CPP_EXPORTS
)
target_sources(qtquickcontrols2materialstyleplugin
diff --git a/src/quickcontrols/universal/CMakeLists.txt b/src/quickcontrols/universal/CMakeLists.txt
index b9ab5d9aaa..264c7255d3 100644
--- a/src/quickcontrols/universal/CMakeLists.txt
+++ b/src/quickcontrols/universal/CMakeLists.txt
@@ -123,7 +123,6 @@ qt_internal_add_qml_module(QuickControls2Universal
Qt::QuickControls2UniversalStyleImpl
Qt::QuickPrivate
Qt::QuickTemplates2Private
- GENERATE_CPP_EXPORTS
)
target_sources(qtquickcontrols2universalstyleplugin
diff --git a/src/quickcontrolsimpl/CMakeLists.txt b/src/quickcontrolsimpl/CMakeLists.txt
index 5b8d932384..f50e671ce9 100644
--- a/src/quickcontrolsimpl/CMakeLists.txt
+++ b/src/quickcontrolsimpl/CMakeLists.txt
@@ -44,7 +44,6 @@ qt_internal_add_qml_module(QuickControls2Impl
Qt::Core
Qt::Gui
Qt::Quick
- GENERATE_CPP_EXPORTS
)
qt_internal_extend_target(QuickControls2Impl CONDITION QT_FEATURE_quick_listview AND QT_FEATURE_quick_pathview
diff --git a/src/quickdialogs/quickdialogs/CMakeLists.txt b/src/quickdialogs/quickdialogs/CMakeLists.txt
index ec9c37c2f9..371e1589c2 100644
--- a/src/quickdialogs/quickdialogs/CMakeLists.txt
+++ b/src/quickdialogs/quickdialogs/CMakeLists.txt
@@ -49,7 +49,6 @@ qt_internal_add_qml_module(QuickDialogs2
Qt::Core
Qt::Gui
Qt::Quick
- GENERATE_CPP_EXPORTS
)
qt_internal_add_docs(QuickDialogs2
diff --git a/src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt b/src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt
index 9191eaa379..5e219624bc 100644
--- a/src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt
+++ b/src/quickdialogs/quickdialogsquickimpl/CMakeLists.txt
@@ -111,7 +111,6 @@ qt_internal_add_qml_module(QuickDialogs2QuickImpl
Qt::Core
Qt::Gui
Qt::Quick
- GENERATE_CPP_EXPORTS
)
add_dependencies(QuickDialogs2QuickImpl Qt::QuickControls2Basic)
diff --git a/src/quickdialogs/quickdialogsutils/CMakeLists.txt b/src/quickdialogs/quickdialogsutils/CMakeLists.txt
index bcf54b279c..7254a98e44 100644
--- a/src/quickdialogs/quickdialogsutils/CMakeLists.txt
+++ b/src/quickdialogs/quickdialogsutils/CMakeLists.txt
@@ -24,5 +24,4 @@ qt_internal_add_module(QuickDialogs2Utils
Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Core
- GENERATE_CPP_EXPORTS
)
diff --git a/src/quicklayouts/CMakeLists.txt b/src/quicklayouts/CMakeLists.txt
index 4eeb697461..7dad1a0c33 100644
--- a/src/quicklayouts/CMakeLists.txt
+++ b/src/quicklayouts/CMakeLists.txt
@@ -24,5 +24,4 @@ qt_internal_add_qml_module(QuickLayouts
Qt::GuiPrivate
Qt::QuickPrivate
Qt::Qml
- GENERATE_CPP_EXPORTS
)
diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt
index f9fbfb75e7..78297fb532 100644
--- a/src/quickshapes/CMakeLists.txt
+++ b/src/quickshapes/CMakeLists.txt
@@ -27,7 +27,6 @@ qt_internal_add_qml_module(QuickShapesPrivate
Qt::GuiPrivate
Qt::Qml
Qt::QuickPrivate
- GENERATE_CPP_EXPORTS
)
# We need to do additional initialization, so we have to provide our own
diff --git a/src/quicktemplates/CMakeLists.txt b/src/quicktemplates/CMakeLists.txt
index 18a128248e..6a98ce2f89 100644
--- a/src/quicktemplates/CMakeLists.txt
+++ b/src/quicktemplates/CMakeLists.txt
@@ -123,7 +123,6 @@ qt_internal_add_qml_module(QuickTemplates2
Qt::Core
Qt::Gui
Qt::Quick
- GENERATE_CPP_EXPORTS
)
qt_internal_extend_target(QuickTemplates2 CONDITION TARGET Qt::QmlModels
diff --git a/src/quickvectorimage/CMakeLists.txt b/src/quickvectorimage/CMakeLists.txt
index ecca0432e5..b0921cdc63 100644
--- a/src/quickvectorimage/CMakeLists.txt
+++ b/src/quickvectorimage/CMakeLists.txt
@@ -20,7 +20,6 @@ qt_internal_add_module(QuickVectorImageGeneratorPrivate
Qt::QuickPrivate
Qt::QuickShapesPrivate
Qt::SvgPrivate
- GENERATE_CPP_EXPORTS
)
qt_internal_add_qml_module(QuickVectorImage
@@ -36,5 +35,4 @@ qt_internal_add_qml_module(QuickVectorImage
Qt::QuickPrivate
Qt::QuickVectorImageGeneratorPrivate
Qt::SvgPrivate
- GENERATE_CPP_EXPORTS
)
diff --git a/src/quickwidgets/CMakeLists.txt b/src/quickwidgets/CMakeLists.txt
index aa7a682343..f3575c84fc 100644
--- a/src/quickwidgets/CMakeLists.txt
+++ b/src/quickwidgets/CMakeLists.txt
@@ -33,7 +33,6 @@ qt_internal_add_module(QuickWidgets
Qt::QmlPrivate
Qt::QuickPrivate
Qt::WidgetsPrivate
- GENERATE_CPP_EXPORTS
)
qt_internal_extend_target(QuickWidgets CONDITION QT_FEATURE_accessibility