Merge remote-tracking branch 'origin/4.14'

Change-Id: Iea84f23cf394de13e99a9ed777c8c113e4eff473
2020-11-19 15:38:13 +01:00
parent b269066435 9b6944086b
commit 5ca70bdcb3
271 changed files with 2816 additions and 1016 deletions
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -394,6 +394,12 @@ void CMakeBuildSystem::setParametersAndRequestParse(const BuildDirParameters &pa
                            tr("The kit needs to define a CMake tool to parse this project.")));
        return;
    }
+    if (!parameters.cmakeTool()->hasFileApi()) {
+        TaskHub::addTask(BuildSystemTask(Task::Error,
+                                         CMakeKitAspect::msgUnsupportedVersion(
+                                             parameters.cmakeTool()->version().fullVersion)));
+        return;
+    }
    QTC_ASSERT(parameters.isValid(), return );

    m_parameters = parameters;