diff options
Diffstat (limited to 'src/plugins/cmakeprojectmanager/fileapidataextractor.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/fileapidataextractor.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp index 6c5f7791e2..08937953f1 100644 --- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp +++ b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp @@ -25,11 +25,9 @@ #include "fileapidataextractor.h" -#include "cmakeprojectnodes.h" +#include "fileapiparser.h" #include "projecttreehelper.h" -#include <projectexplorer/projectnodes.h> - #include <utils/algorithm.h> #include <utils/qtcassert.h> #include <utils/qtcprocess.h> @@ -78,7 +76,7 @@ CMakeFileResult extractCMakeFilesData(const std::vector<FileApiDetails::CMakeFil if (oldCount < result.cmakeFiles.count()) { if (info.isCMake && !info.isCMakeListsDotTxt) { // Skip files that cmake considers to be part of the installation -- but include - // CMakeLists.txt files. This unbreaks cmake binaries running from their own + // CMakeLists.txt files. This fixes cmake binaries running from their own // build directory. continue; } @@ -278,7 +276,7 @@ QList<CMakeBuildTarget> generateBuildTargets(const PreprocessedData &input, // CMake sometimes mixes several shell-escaped pieces into one fragment. Disentangle that again: const QStringList parts = QtcProcess::splitArgs(f.fragment); - for (const QString part : parts) { + for (const QString &part : parts) { // Some projects abuse linking to libraries to pass random flags to the linker, so ignore // flags mixed into a fragment if (part.startsWith("-")) @@ -527,7 +525,7 @@ void addCompileGroups(ProjectNode *targetRoot, FolderNode *insertNode = createSourceGroupNode(td.sourceGroups[i], baseDirectory, targetRoot); - insertNode->addNestedNodes(std::move(sourceGroupFileNodes[i])); + insertNode->addNestedNodes(std::move(current), baseDirectory); } addCMakeVFolder(targetRoot, |