feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.3'

Browse Source 
Change-Id: Ie18d823d0940113e8a78c81204b7a7ca07a060ba
This commit is contained in:
Eike Ziller
2017-04-26 10:16:38 +02:00
parent 73f2c0f4e8 b6bf1fdf38
commit 531fba61f0
6 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
View File

@@ -250,9 +250,10 @@ QList<void *> CMakeProjectImporter::examineDirectory(const Utils::FileName &impo
}
const auto homeDir
= Utils::FileName::fromUserInput(QString::fromUtf8(CMakeConfigItem::valueOf("CMAKE_HOME_DIRECTORY", config)));
if (homeDir != projectDirectory()) {
const Utils::FileName canonicalProjectDirectory = Utils::FileUtils::canonicalPath(projectDirectory());
if (homeDir != canonicalProjectDirectory) {
qCDebug(cmInputLog()) << "Wrong source directory:" << homeDir.toUserOutput()
<< "expected:" << projectDirectory().toUserOutput();
<< "expected:" << canonicalProjectDirectory.toUserOutput();
return { };
}

2
src/plugins/cmakeprojectmanager/servermode.cpp
View File

@@ -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())