summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2023-09-05 16:42:21 +0200
committerAlexey Edelev <alexey.edelev@qt.io>2023-09-12 16:33:56 +0200
commit09c46d63af3ea68d7b49c395b9375d2b5d3ed666 (patch)
tree0dbfeb6bd10f578fe29232db57ddda84ee6caec8 /src/tools
parentcab5ede6a3890b9cc07e54a0558a577c932ec21a (diff)
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 6.6 Change-Id: Ibb2d262e41c6de7dfb34c39cabd6b19c43aa9636 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/syncqt/main.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/tools/syncqt/main.cpp b/src/tools/syncqt/main.cpp
index 0f45661eab..bc5533029b 100644
--- a/src/tools/syncqt/main.cpp
+++ b/src/tools/syncqt/main.cpp
@@ -1634,8 +1634,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;