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

syncqt: Generate the deprecated header in the framework directory too

Browse Source 
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 <alexandru.croitor@qt.io>
(cherry picked from commit 09c46d63af3ea68d7b49c395b9375d2b5d3ed666)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2023-09-05 16:42:21 +02:00 committed by Qt Cherry-pick Bot
parent 18678e3fc7
commit 89b36f4943
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/tools/syncqt/main.cpp
View File

@ -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;