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

CppTools: Move RawProjectPart to ProjectExplorer

Browse Source 
Doesn't have any dependencies into CppTools anymore, therefore moving it
reduces the dependencies of the project managers to CppTools as well.

Change-Id: Ibe728abe59eb88a8877943dca1f48a85163e27ac
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2019-08-28 18:22:45 +02:00
parent f52c4f450d
commit 9cc45fe1fb
36 changed files with 126 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cmakeprojectmanager/servermodereader.cpp
View File

@@ -293,10 +293,10 @@ std::unique_ptr<CMakeProjectNode> ServerModeReader::generateProjectTree(const QL
return root;
}
CppTools::RawProjectParts ServerModeReader::createRawProjectParts(QString &errorMessage)
RawProjectParts ServerModeReader::createRawProjectParts(QString &errorMessage)
{
Q_UNUSED(errorMessage)
CppTools::RawProjectParts rpps;
RawProjectParts rpps;
int counter = 0;
for (const FileGroup *fg : qAsConst(m_fileGroups)) {
@@ -317,18 +317,18 @@ CppTools::RawProjectParts ServerModeReader::createRawProjectParts(QString &error
const QStringList flags = QtcProcess::splitArgs(fg->compileFlags);
const QStringList includes = transform(fg->includePaths, [](const IncludePath *ip) { return ip->path.toString(); });
CppTools::RawProjectPart rpp;
RawProjectPart rpp;
rpp.setProjectFileLocation(fg->target->sourceDirectory.toString() + "/CMakeLists.txt");
rpp.setBuildSystemTarget(fg->target->name);
rpp.setDisplayName(fg->target->name + QString::number(counter));
rpp.setMacros(fg->macros);
rpp.setIncludePaths(includes);
CppTools::RawProjectPartFlags cProjectFlags;
RawProjectPartFlags cProjectFlags;
cProjectFlags.commandLineFlags = flags;
rpp.setFlagsForC(cProjectFlags);
CppTools::RawProjectPartFlags cxxProjectFlags;
RawProjectPartFlags cxxProjectFlags;
cxxProjectFlags.commandLineFlags = flags;
rpp.setFlagsForCxx(cxxProjectFlags);