From 8e424eba741f882d3fc79c97910217b5bcfd2a3b Mon Sep 17 00:00:00 2001 From: Florian de Gaulejac Date: Thu, 11 Jan 2024 11:27:49 +0100 Subject: [PATCH] syncqt: always use absolute path in the generated headers 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 (cherry picked from commit b4246a5c28472de3c4b6a85a3daf4a1d578894ab) Reviewed-by: Qt Cherry-pick Bot --- src/tools/syncqt/main.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/tools/syncqt/main.cpp b/src/tools/syncqt/main.cpp index 38ef61ef264..bcbb5d4b409 100644 --- a/src/tools/syncqt/main.cpp +++ b/src/tools/syncqt/main.cpp @@ -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;