From f0d14da7b9a4ec7ffd2c5fa484311992ee4e97e3 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 27 Apr 2017 08:19:24 +0000 Subject: [PATCH] Revert "CMake: Use canonical source directory when talking to cmake server-mode" This reverts commit b2fe7c9ad16f877ff61c6ce262f23b84180733e8. QTCREATORBUG-18105 reports that this makes cmake work, but then in later stages files get filtered from the project tree as paths no longer match up. Change-Id: I9484c7311a15a0397d9078ed60c8a65ef82f8449 Reviewed-by: Tim Jenssen --- src/plugins/cmakeprojectmanager/servermode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/cmakeprojectmanager/servermode.cpp b/src/plugins/cmakeprojectmanager/servermode.cpp index 04f7ac9c299..473b58ed656 100644 --- a/src/plugins/cmakeprojectmanager/servermode.cpp +++ b/src/plugins/cmakeprojectmanager/servermode.cpp @@ -464,7 +464,7 @@ void ServerMode::handleHello(const QVariantMap &data) if (m_minorProtocol >= 0) version.insert("minor", m_minorProtocol); extra.insert("protocolVersion", version); - extra.insert("sourceDirectory", m_sourceDirectory.toFileInfo().canonicalFilePath()); + extra.insert("sourceDirectory", m_sourceDirectory.toString()); extra.insert("buildDirectory", m_buildDirectory.toString()); extra.insert("generator", m_generator); if (!m_platform.isEmpty())