1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove GENERATE_CPP_EXPORTS argument

Browse Source 
The behavior that argument was enabling is the default one now.

Task-number: QTBUG-90492
Change-Id: I11711d4c794f0b22169abb595b8ffad2eeb1300d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 1ef3bd05eb45d53cdcf92b933603b995283b3432)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2023-11-28 14:17:19 +01:00 committed by Qt Cherry-pick Bot
parent a4f4058d64
commit 10b48d59dd
16 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/Qt3rdPartyLibraryHelpers.cmake
View File

@ -371,6 +371,7 @@ function(qt_internal_add_3rdparty_header_module target)
INTERNAL_MODULE INTERNAL_MODULE
HEADER_MODULE HEADER_MODULE
NO_CONFIG_HEADER_FILE NO_CONFIG_HEADER_FILE
NO_GENERATE_CPP_EXPORTS
EXTERNAL_HEADERS ${arg_EXTERNAL_HEADERS} EXTERNAL_HEADERS ${arg_EXTERNAL_HEADERS}
EXTERNAL_HEADERS_DIR ${arg_EXTERNAL_HEADERS_DIR} EXTERNAL_HEADERS_DIR ${arg_EXTERNAL_HEADERS_DIR}
) )

4
cmake/QtModuleHelpers.cmake
View File

@ -16,7 +16,6 @@ macro(qt_internal_get_internal_add_module_keywords option_args single_args multi
NO_ADDITIONAL_TARGET_INFO NO_ADDITIONAL_TARGET_INFO
NO_GENERATE_METATYPES NO_GENERATE_METATYPES
NO_HEADERSCLEAN_CHECK NO_HEADERSCLEAN_CHECK
GENERATE_CPP_EXPORTS # deprecated
NO_GENERATE_CPP_EXPORTS NO_GENERATE_CPP_EXPORTS
NO_UNITY_BUILD 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. # 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 # Static libraries don't need to export their symbols, and corner cases when sources are
# also used in shared libraries, should be handled manually. # 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 if(NOT arg_NO_GENERATE_CPP_EXPORTS AND NOT arg_STATIC AND NOT arg_HEADER_MODULE)
AND NOT arg_HEADER_MODULE)
if(arg_CPP_EXPORT_HEADER_BASE_NAME) if(arg_CPP_EXPORT_HEADER_BASE_NAME)
set(cpp_export_header_base_name set(cpp_export_header_base_name
"CPP_EXPORT_HEADER_BASE_NAME;${arg_CPP_EXPORT_HEADER_BASE_NAME}" "CPP_EXPORT_HEADER_BASE_NAME;${arg_CPP_EXPORT_HEADER_BASE_NAME}"

1
src/concurrent/CMakeLists.txt
View File

@ -37,7 +37,6 @@ qt_internal_add_module(Concurrent
Qt::CorePrivate Qt::CorePrivate
PRECOMPILED_HEADER PRECOMPILED_HEADER
"../corelib/global/qt_pch.h" "../corelib/global/qt_pch.h"
GENERATE_CPP_EXPORTS
) )
## Scopes: ## Scopes:

1
src/corelib/CMakeLists.txt
View File

@ -334,7 +334,6 @@ qt_internal_add_module(Core
WrapZLIB::WrapZLIB WrapZLIB::WrapZLIB
PRECOMPILED_HEADER PRECOMPILED_HEADER
"global/qt_pch.h" "global/qt_pch.h"
GENERATE_CPP_EXPORTS
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Platform Qt::Platform
EXTRA_CMAKE_FILES EXTRA_CMAKE_FILES

1
src/dbus/CMakeLists.txt
View File

@ -54,7 +54,6 @@ qt_internal_add_module(DBus
Qt::Core Qt::Core
PRIVATE_MODULE_INTERFACE PRIVATE_MODULE_INTERFACE
Qt::CorePrivate Qt::CorePrivate
GENERATE_CPP_EXPORTS
) )
# This file is included by qdbusargument.cpp # This file is included by qdbusargument.cpp

1
src/gui/CMakeLists.txt
View File

@ -290,7 +290,6 @@ qt_internal_add_module(Gui
painting/qdrawhelper.cpp painting/qdrawhelper.cpp
PRECOMPILED_HEADER PRECOMPILED_HEADER
"kernel/qt_gui_pch.h" "kernel/qt_gui_pch.h"
GENERATE_CPP_EXPORTS
QPA_HEADER_FILTERS QPA_HEADER_FILTERS
"(^|/)qplatform.+\\.h$|(^|/)qwindowsystem.+\\.h$" "(^|/)qplatform.+\\.h$|(^|/)qwindowsystem.+\\.h$"
RHI_HEADER_FILTERS RHI_HEADER_FILTERS

1
src/network/CMakeLists.txt
View File

@ -76,7 +76,6 @@ qt_internal_add_module(Network
compat/removed_api.cpp compat/removed_api.cpp
PRECOMPILED_HEADER PRECOMPILED_HEADER
"../corelib/global/qt_pch.h" "../corelib/global/qt_pch.h"
GENERATE_CPP_EXPORTS
) )
## Scopes: ## Scopes:

1
src/opengl/CMakeLists.txt
View File

@ -49,7 +49,6 @@ qt_internal_add_module(OpenGL
PRIVATE_MODULE_INTERFACE PRIVATE_MODULE_INTERFACE
Qt::CorePrivate Qt::CorePrivate
Qt::GuiPrivate Qt::GuiPrivate
GENERATE_CPP_EXPORTS
) )
## Scopes: ## Scopes:

1
src/openglwidgets/CMakeLists.txt
View File

@ -20,5 +20,4 @@ qt_internal_add_module(OpenGLWidgets
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::OpenGL Qt::OpenGL
Qt::Widgets Qt::Widgets
GENERATE_CPP_EXPORTS
) )

1
src/printsupport/CMakeLists.txt
View File

@ -39,7 +39,6 @@ qt_internal_add_module(PrintSupport
Qt::CorePrivate Qt::CorePrivate
Qt::GuiPrivate Qt::GuiPrivate
Qt::WidgetsPrivate Qt::WidgetsPrivate
GENERATE_CPP_EXPORTS
QPA_HEADER_FILTERS QPA_HEADER_FILTERS
"(^|/)qplatform.+\\.h$" "(^|/)qplatform.+\\.h$"
) )

1
src/sql/CMakeLists.txt
View File

@ -37,7 +37,6 @@ qt_internal_add_module(Sql
"compat/removed_api.cpp" "compat/removed_api.cpp"
PRECOMPILED_HEADER PRECOMPILED_HEADER
"../corelib/global/qt_pch.h" "../corelib/global/qt_pch.h"
GENERATE_CPP_EXPORTS
) )
## Scopes: ## Scopes:

1
src/testlib/CMakeLists.txt
View File

@ -78,7 +78,6 @@ qt_internal_add_module(Test
Qt::Core Qt::Core
PRIVATE_MODULE_INTERFACE PRIVATE_MODULE_INTERFACE
Qt::CorePrivate Qt::CorePrivate
GENERATE_CPP_EXPORTS
) )
if(TARGET Gui) if(TARGET Gui)

1
src/widgets/CMakeLists.txt
View File

@ -71,7 +71,6 @@ qt_internal_add_module(Widgets
"kernel/qt_widgets_pch.h" "kernel/qt_widgets_pch.h"
NO_PCH_SOURCES NO_PCH_SOURCES
compat/removed_api.cpp compat/removed_api.cpp
GENERATE_CPP_EXPORTS
) )
qt_internal_extend_target(Widgets CONDITION APPLE qt_internal_extend_target(Widgets CONDITION APPLE

1
src/xml/CMakeLists.txt
View File

@ -21,7 +21,6 @@ qt_internal_add_module(Xml
Qt::Core Qt::Core
PRIVATE_MODULE_INTERFACE PRIVATE_MODULE_INTERFACE
Qt::CorePrivate Qt::CorePrivate
GENERATE_CPP_EXPORTS
) )
## Scopes: ## Scopes:

1
tests/auto/cmake/test_generating_cpp_exports/test_autogenerating_cpp_exports/CMakeLists.txt
View File

@ -3,7 +3,6 @@
qt_internal_add_module(TestAutogeneratingCppExports qt_internal_add_module(TestAutogeneratingCppExports
NO_UNITY_BUILD NO_UNITY_BUILD
GENERATE_CPP_EXPORTS
SOURCES SOURCES
module_api.h module_api.h
module_api.cpp module_api.cpp

1
tests/auto/cmake/test_generating_cpp_exports/test_autogenerating_cpp_exports_custom_name/CMakeLists.txt
View File

@ -3,7 +3,6 @@
qt_internal_add_module(TestAutogeneratingCppExportsCustomName qt_internal_add_module(TestAutogeneratingCppExportsCustomName
NO_UNITY_BUILD NO_UNITY_BUILD
GENERATE_CPP_EXPORTS
CPP_EXPORT_HEADER_BASE_NAME CPP_EXPORT_HEADER_BASE_NAME
"customname_exports" "customname_exports"
SOURCES SOURCES