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

CMakeCbpParser: Small cleanups

Browse Source 
* Do follow-up fixes to CMakeTool

Change-Id: Ia3c587acb85d613499e91988200d8bbae32eca3d
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-02-12 12:30:55 +01:00
parent e868357107
commit d400959d7e
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cmakeprojectmanager/cmakecbpparser.cpp
View File

@@ -151,7 +151,7 @@ void CMakeCbpParser::sortFiles()
qCDebug(log) << target.title << target.sourceDirectory << target.includeFiles << target.defines << target.files << "\n";
}
bool CMakeCbpParser::parseCbpFile(Kit *kit, const QString &fileName, const QString &sourceDirectory)
bool CMakeCbpParser::parseCbpFile(const Kit *const kit, const QString &fileName, const QString &sourceDirectory)
{
m_kit = kit;
m_buildDirectory = QFileInfo(fileName).absolutePath();
@@ -437,14 +437,14 @@ void CMakeCbpParser::parseUnit()
fileName = FileName::fromUserInput(mappedFile);
}
m_parsingCmakeUnit = false;
m_parsingCMakeUnit = false;
m_unitTarget.clear();
while (!atEnd()) {
readNext();
if (isEndElement()) {
if (!fileName.endsWith(QLatin1String(".rule")) && !m_processedUnits.contains(fileName)) {
// Now check whether we found a virtual element beneath
if (m_parsingCmakeUnit) {
if (m_parsingCMakeUnit) {
m_cmakeFileList.append( new ProjectExplorer::FileNode(fileName, ProjectExplorer::ProjectFileType, false));
} else {
bool generated = false;
@@ -475,7 +475,7 @@ void CMakeCbpParser::parseUnit()
void CMakeCbpParser::parseUnitOption()
{
const QXmlStreamAttributes optionAttributes = attributes();
m_parsingCmakeUnit = optionAttributes.hasAttribute(QLatin1String("virtualFolder"));
m_parsingCMakeUnit = optionAttributes.hasAttribute(QLatin1String("virtualFolder"));
m_unitTarget = optionAttributes.value(QLatin1String("target")).toString();
while (!atEnd()) {