diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2017-04-25 15:55:23 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2017-04-25 15:31:21 +0000 |
| commit | b2fe7c9ad16f877ff61c6ce262f23b84180733e8 (patch) | |
| tree | 69388682c6fa7c851eef528d262351ecd6f4c603 | |
| parent | b913e9d548dfc681172077aa14c1b998488cd2b6 (diff) | |
CMake: Use canonical source directory when talking to cmake server-mode
Use the canonical form of the source directory when talking to cmake.
Cmake will save the canonical source directory in its settings and will
fail if that is not passed in again.
Change-Id: I1ea578053c8d5136d09b3f503443bd0188ebca4f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| -rw-r--r-- | src/plugins/cmakeprojectmanager/servermode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/servermode.cpp b/src/plugins/cmakeprojectmanager/servermode.cpp index 473b58ed65..04f7ac9c29 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.toString()); + extra.insert("sourceDirectory", m_sourceDirectory.toFileInfo().canonicalFilePath()); extra.insert("buildDirectory", m_buildDirectory.toString()); extra.insert("generator", m_generator); if (!m_platform.isEmpty()) |