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

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Change-Id: I7d55c01489dfcdd26fcf3ced9f26539a09073e8c
This commit is contained in:
Orgad Shaneh
2021-02-06 22:35:18 +02:00
parent 55945c3307 bd25785997
commit dad2b3d84b
7 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
View File

@@ -118,9 +118,6 @@ public:
, m_changed(changed)
{
updateErrorFlags();
m_tooltip = tr("Version: %1<br>Supports fileApi: %2")
.arg(QString::fromUtf8(item->version().fullVersion))
.arg(item->hasFileApi() ? tr("yes") : tr("no"));
}
CMakeToolTreeItem(const QString &name,
@@ -146,6 +143,15 @@ public:
m_pathExists = fi.exists();
m_pathIsFile = fi.isFile();
m_pathIsExecutable = fi.isExecutable();
CMakeTool cmake(m_autodetected ? CMakeTool::AutoDetection
: CMakeTool::ManualDetection, m_id);
cmake.setFilePath(m_executable);
m_isSupported = cmake.hasFileApi();
m_tooltip = tr("Version: %1<br>Supports fileApi: %2")
.arg(QString::fromUtf8(cmake.version().fullVersion))
.arg(cmake.hasFileApi() ? tr("yes") : tr("no"));
}
CMakeToolTreeItem() = default;