From 89b36f49436f72d3d5e21e7709a6016e86e1ff27 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 5 Sep 2023 16:42:21 +0200 Subject: [PATCH] syncqt: Generate the deprecated header in the framework directory too Generate the missing deprecated header in the framework directory for the cross-module deprecation case. Amends 7e84a04563142d217317928865a8f6475d189d95 Pick-to: 6.5 Change-Id: Ibb2d262e41c6de7dfb34c39cabd6b19c43aa9636 Reviewed-by: Alexandru Croitor (cherry picked from commit 09c46d63af3ea68d7b49c395b9375d2b5d3ed666) Reviewed-by: Qt Cherry-pick Bot --- src/tools/syncqt/main.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/tools/syncqt/main.cpp b/src/tools/syncqt/main.cpp index 8d6709f9816..3182228faa8 100644 --- a/src/tools/syncqt/main.cpp +++ b/src/tools/syncqt/main.cpp @@ -1567,8 +1567,16 @@ public: writeIfDifferent(outputDir + '/' + headerName, buffer.str()); // Add header file to staging installation directory for cross-module deprecation case. - if (isCrossModuleDeprecation) - writeIfDifferent(outputDir + "/.syncqt_staging/" + headerName, buffer.str()); + if (isCrossModuleDeprecation) { + const std::string stagingDir = outputDir + "/.syncqt_staging/"; + writeIfDifferent(stagingDir + headerName, buffer.str()); + if (m_commandLineArgs->isFramework()) { + const std::string frameworkStagingDir = stagingDir + moduleName + + ".framework/Versions/A/Headers/" QT_VERSION_STR "/" + + moduleName.substr(2) + '/'; + writeIfDifferent(frameworkStagingDir + headerName, buffer.str()); + } + } m_producedHeaders.insert(headerName); } return result;