diff --git a/cmake/QtBuildHelpers.cmake b/cmake/QtBuildHelpers.cmake index 327c0a536e4..16abfee01fa 100644 --- a/cmake/QtBuildHelpers.cmake +++ b/cmake/QtBuildHelpers.cmake @@ -235,7 +235,6 @@ function(qt_internal_get_qt_build_private_files_to_install out_var) QtStandaloneTestsConfig.cmake.in QtWriteArgsFile.cmake modulecppexports.h.in - modulecppexports_p.h.in qbatchedtestrunner.in.cpp PARENT_SCOPE ) diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 6669ba97e0e..9794f05e5cf 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -429,12 +429,8 @@ function(qt_internal_add_module target) "CPP_EXPORT_HEADER_BASE_NAME;${arg_CPP_EXPORT_HEADER_BASE_NAME}" ) endif() - if(arg_GENERATE_PRIVATE_CPP_EXPORTS) - set(generate_private_cpp_export "GENERATE_PRIVATE_CPP_EXPORTS") - endif() qt_internal_generate_cpp_global_exports(${target} ${module_define_infix} "${cpp_export_header_base_name}" - "${generate_private_cpp_export}" ) endif() @@ -1165,7 +1161,7 @@ endfunction() function(qt_internal_generate_cpp_global_exports target module_define_infix) cmake_parse_arguments(arg - "GENERATE_PRIVATE_CPP_EXPORTS" + "" "CPP_EXPORT_HEADER_BASE_NAME" "" ${ARGN} ) @@ -1190,20 +1186,6 @@ function(qt_internal_generate_cpp_global_exports target module_define_infix) set(${out_public_header} "${generated_header_path}" PARENT_SCOPE) target_sources(${target} PRIVATE "${generated_header_path}") set_source_files_properties("${generated_header_path}" PROPERTIES GENERATED TRUE) - - if(arg_GENERATE_PRIVATE_CPP_EXPORTS) - set(generated_private_header_path - "${module_build_interface_private_include_dir}/${header_base_name}_p.h" - ) - - configure_file("${QT_CMAKE_DIR}/modulecppexports_p.h.in" - "${generated_private_header_path}" @ONLY - ) - - set(${out_private_header} "${generated_private_header_path}" PARENT_SCOPE) - target_sources(${target} PRIVATE "${generated_private_header_path}") - set_source_files_properties("${generated_private_header_path}" PROPERTIES GENERATED TRUE) - endif() endfunction() function(qt_internal_install_module_headers target) diff --git a/cmake/modulecppexports_p.h.in b/cmake/modulecppexports_p.h.in deleted file mode 100644 index c4e029d5e1a..00000000000 --- a/cmake/modulecppexports_p.h.in +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - -#ifndef @header_base_name_upper@_P_H -#define @header_base_name_upper@_P_H - -// This file is autogenerated. Changes will be overwritten. - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <@module_include_name@/@header_base_name@.h> - -#define Q_@module_define_infix@_PRIVATE_EXPORT Q_@module_define_infix@_EXPORT - -#endif // @header_base_name_upper@_P_H