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

qmake: add displayname method to Qmake*File

Browse Source 
Change-Id: I90e6ef357f050953f51ae9cad4eb1c1d2daf4e5a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-02-15 10:24:32 +01:00
committed by Tim Jenssen
parent 6505a69718
commit 2f333b1072
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
View File

@@ -42,7 +42,6 @@
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <qtsupport/profilereader.h> #include <qtsupport/profilereader.h>
#include <resourceeditor/resourcenode.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
@@ -266,11 +265,21 @@ FileName QmakePriFile::directoryPath() const
return filePath().parentDir(); return filePath().parentDir();
} }
QString QmakePriFile::displayName() const
{
return filePath().toFileInfo().completeBaseName();
}
QmakePriFile *QmakePriFile::parent() const QmakePriFile *QmakePriFile::parent() const
{ {
return m_parent; return m_parent;
} }
QmakeProject *QmakePriFile::project() const
{
return m_project;
}
QVector<QmakePriFile *> QmakePriFile::children() const QVector<QmakePriFile *> QmakePriFile::children() const
{ {
return m_children; return m_children;
@@ -1202,7 +1211,9 @@ bool QmakeProFile::isParent(QmakeProFile *node)
QString QmakeProFile::displayName() const QString QmakeProFile::displayName() const
{ {
if (!m_displayName.isEmpty())
return m_displayName; return m_displayName;
return QmakePriFile::displayName();
} }
bool QmakeProFile::isDebugAndRelease() const bool QmakeProFile::isDebugAndRelease() const
@@ -1704,9 +1715,7 @@ void QmakeProFile::applyEvaluate(QmakeEvalResult *evalResult)
if (m_varValues != result->newVarValues) if (m_varValues != result->newVarValues)
m_varValues = result->newVarValues; m_varValues = result->newVarValues;
const QString projectName = singleVariableValue(Variable::QmakeProjectName); m_displayName = singleVariableValue(Variable::QmakeProjectName);
m_displayName = projectName.isEmpty() ? filePath().toFileInfo().completeBaseName()
: projectName;
} // result == EvalOk } // result == EvalOk
setParseInProgress(false); setParseInProgress(false);

4
src/plugins/qmakeprojectmanager/qmakeparsernodes.h
View File

@@ -114,8 +114,10 @@ public:
Utils::FileName filePath() const; Utils::FileName filePath() const;
Utils::FileName directoryPath() const; Utils::FileName directoryPath() const;
virtual QString displayName() const;
QmakePriFile *parent() const; QmakePriFile *parent() const;
QmakeProject *project() const;
QVector<QmakePriFile *> children() const; QVector<QmakePriFile *> children() const;
void makeEmpty(); void makeEmpty();
@@ -269,7 +271,7 @@ public:
~QmakeProFile() override; ~QmakeProFile() override;
bool isParent(QmakeProFile *node); bool isParent(QmakeProFile *node);
QString displayName() const; QString displayName() const final;
ProjectType projectType() const; ProjectType projectType() const;