Commit fa79b975 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

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

catch up with the recent change in qmake
parent 79073d3d
......@@ -2848,8 +2848,8 @@ ProStringList ProFileEvaluator::Private::values(const ProString &variableName) c
case V__LINE_: //parser line number
ret = QString::number(m_lineNo);
break;
case V__FILE_: //parser file; qmake is a bit weird here
ret = m_profileStack.size() == 1 ? currentFileName() : currentProFile()->displayFileName();
case V__FILE_: //parser file
ret = currentFileName();
break;
case V__DATE_: //current date/time
ret = QDateTime::currentDateTime().toString();
......
......@@ -334,13 +334,8 @@ ProFile::ProFile(const QString &fileName)
: m_refCount(1),
m_fileName(fileName)
{
if (fileName.startsWith(QLatin1Char('('))) {
m_displayFileName = fileName;
} else {
int nameOff = fileName.lastIndexOf(QLatin1Char('/'));
m_displayFileName = fileName.mid(nameOff + 1);
m_directoryName = fileName.left(nameOff);
}
if (!fileName.startsWith(QLatin1Char('(')))
m_directoryName = fileName.left(fileName.lastIndexOf(QLatin1Char('/')));
}
ProFile::~ProFile()
......
......@@ -186,7 +186,6 @@ public:
explicit ProFile(const QString &fileName);
~ProFile();
QString displayFileName() const { return m_displayFileName; }
QString fileName() const { return m_fileName; }
QString directoryName() const { return m_directoryName; }
const QString &items() const { return m_proitems; }
......@@ -199,7 +198,6 @@ private:
ProItemRefCount m_refCount;
QString m_proitems;
QString m_fileName;
QString m_displayFileName;
QString m_directoryName;
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment