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

syncqt: always use absolute path in the generated headers

Browse Source 
The relative path + source path can be tool long for windows

Fixes: QTBUG-120758
Pick-to: 6.6 6.5
Change-Id: I42ed4f3bbf39d31bf37a5bc76eb18f473661346b
Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit b4246a5c28472de3c4b6a85a3daf4a1d578894ab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Florian de Gaulejac 2024-01-11 11:27:49 +01:00 committed by Qt Cherry-pick Bot
parent 54e2ec9b8a
commit 8e424eba74
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -889,12 +889,7 @@ public:
bool headerFileExists = std::filesystem::exists(headerFile);
std::filesystem::path headerFileRootName =
std::filesystem::weakly_canonical(headerFile, ec).root_name();
std::string aliasedFilepath = !ec && headerFileRootName == m_outputRootName
? std::filesystem::relative(headerFile, outputDir).generic_string()
: headerFile.generic_string();
ec.clear();
std::string aliasedFilepath = headerFile.generic_string();
std::string aliasPath = outputDir + '/' + m_currentFilename;