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

don't strip path from $$_FILE_ for even for included files

Browse Source 
catch up with the recent change in qmake
This commit is contained in:
Oswald Buddenhagen
2010-06-23 15:00:03 +02:00
parent 79073d3d93
commit fa79b97511
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/proparser/profileevaluator.cpp
View File

@@ -2848,8 +2848,8 @@ ProStringList ProFileEvaluator::Private::values(const ProString &variableName) c
case V__LINE_: //parser line number case V__LINE_: //parser line number
ret = QString::number(m_lineNo); ret = QString::number(m_lineNo);
break; break;
case V__FILE_: //parser file; qmake is a bit weird here case V__FILE_: //parser file
ret = m_profileStack.size() == 1 ? currentFileName() : currentProFile()->displayFileName(); ret = currentFileName();
break; break;
case V__DATE_: //current date/time case V__DATE_: //current date/time
ret = QDateTime::currentDateTime().toString(); ret = QDateTime::currentDateTime().toString();

9
src/shared/proparser/proitems.cpp
View File

@@ -334,13 +334,8 @@ ProFile::ProFile(const QString &fileName)
: m_refCount(1), : m_refCount(1),
m_fileName(fileName) m_fileName(fileName)
{ {
if (fileName.startsWith(QLatin1Char('('))) { if (!fileName.startsWith(QLatin1Char('(')))
m_displayFileName = fileName; m_directoryName = fileName.left(fileName.lastIndexOf(QLatin1Char('/')));
} else {
int nameOff = fileName.lastIndexOf(QLatin1Char('/'));
m_displayFileName = fileName.mid(nameOff + 1);
m_directoryName = fileName.left(nameOff);
}
} }
ProFile::~ProFile() ProFile::~ProFile()

2
src/shared/proparser/proitems.h
View File

@@ -186,7 +186,6 @@ public:
explicit ProFile(const QString &fileName); explicit ProFile(const QString &fileName);
~ProFile(); ~ProFile();
QString displayFileName() const { return m_displayFileName; }
QString fileName() const { return m_fileName; } QString fileName() const { return m_fileName; }
QString directoryName() const { return m_directoryName; } QString directoryName() const { return m_directoryName; }
const QString &items() const { return m_proitems; } const QString &items() const { return m_proitems; }
@@ -199,7 +198,6 @@ private:
ProItemRefCount m_refCount; ProItemRefCount m_refCount;
QString m_proitems; QString m_proitems;
QString m_fileName; QString m_fileName;
QString m_displayFileName;
QString m_directoryName; QString m_directoryName;
}; };