diff options
| author | hjk <hjk@qt.io> | 2019-10-23 08:47:05 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-10-25 09:01:52 +0000 |
| commit | 6a878c72930a55702e0d42ad2f72dd1471c31cd2 (patch) | |
| tree | 2c7dcd53c6d18468bafb0d0b6524bb2d3f433fa2 /src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp | |
| parent | 5b815d22a39e7849767b05b34aff7be3eba5ca33 (diff) | |
ProjectExplorer: Use a functor for BuildSystem creation
... instead of creating the BuildSystem direct. This will help the
shift of BuildSystem owner ship as a Project will have potentially
multiple BuildSystem instances (one per BuildConfiguration), but
still be responsible for creating them with the Targets.
Change-Id: I2dd71c7687ed41af9e42c874b3f932ce704e7ee3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index 6e08d1dc6a..c1d5f04142 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -57,8 +57,8 @@ Q_LOGGING_CATEGORY(cmakeBuildSystemLog, "qtc.cmake.buildsystem", QtWarningMsg); // CMakeBuildSystem: // -------------------------------------------------------------------- -CMakeBuildSystem::CMakeBuildSystem(CMakeProject *p) - : BuildSystem(p) +CMakeBuildSystem::CMakeBuildSystem(Project *project) + : BuildSystem(project) , m_cppCodeModelUpdater(new CppTools::CppProjectUpdater) { // TreeScanner: @@ -67,9 +67,9 @@ CMakeBuildSystem::CMakeBuildSystem(CMakeProject *p) this, &CMakeBuildSystem::handleTreeScanningFinished); - m_treeScanner.setFilter([this, p](const Utils::MimeType &mimeType, const Utils::FilePath &fn) { + m_treeScanner.setFilter([this](const MimeType &mimeType, const FilePath &fn) { // Mime checks requires more resources, so keep it last in check list - auto isIgnored = fn.toString().startsWith(p->projectFilePath().toString() + ".user") + auto isIgnored = fn.toString().startsWith(projectFilePath().toString() + ".user") || TreeScanner::isWellKnownBinary(mimeType, fn); // Cache mime check result for speed up |