diff --git a/src/plugins/qt4projectmanager/profilereader.cpp b/src/plugins/qt4projectmanager/profilereader.cpp index 66fbc2f8b978da3fd9d01f4faa8beb525ebb2c1b..7eaa5157b9b70544f513d2674d0aa32847e38b83 100644 --- a/src/plugins/qt4projectmanager/profilereader.cpp +++ b/src/plugins/qt4projectmanager/profilereader.cpp @@ -87,16 +87,6 @@ QList<ProFile*> ProFileReader::includeFiles() const return list; } -QString ProFileReader::value(const QString &variable) const -{ - const QStringList &vals = values(variable); - if (!vals.isEmpty()) - return vals.first(); - - return QString(); -} - - void ProFileReader::fileMessage(const QString &message) { Q_UNUSED(message) diff --git a/src/plugins/qt4projectmanager/profilereader.h b/src/plugins/qt4projectmanager/profilereader.h index 1019be7870af6c07622e0dc1261bdb973f7bb071..3fec6307f1f5a5551b92a70b0478f90d5a67d77c 100644 --- a/src/plugins/qt4projectmanager/profilereader.h +++ b/src/plugins/qt4projectmanager/profilereader.h @@ -51,8 +51,6 @@ public: bool readProFile(const QString &fileName); QList<ProFile*> includeFiles() const; - QString value(const QString &variable) const; - ProFile *proFileFor(const QString &name); signals: void errorFound(const QString &error); diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index b18d06794a45748e40e513b08da02c105f78a54e..700c30b2c7fe9af04962086f896a0263cb4b0554 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -4080,6 +4080,15 @@ static QStringList expandEnvVars(const ProStringList &x) return ret; } +QString ProFileEvaluator::value(const QString &variable) const +{ + const QStringList &vals = values(variable); + if (!vals.isEmpty()) + return vals.first(); + + return QString(); +} + QStringList ProFileEvaluator::values(const QString &variableName) const { return expandEnvVars(d->values(ProString(variableName))); diff --git a/src/shared/proparser/profileevaluator.h b/src/shared/proparser/profileevaluator.h index 2fe48fc562f257d3c11012c8d01c54faa617d5bc..239c4e1d0b20174d4a00dd2892de1ca1aebcce0c 100644 --- a/src/shared/proparser/profileevaluator.h +++ b/src/shared/proparser/profileevaluator.h @@ -90,6 +90,7 @@ public: bool accept(ProFile *pro); bool contains(const QString &variableName) const; + QString value(const QString &variableName) const; QStringList values(const QString &variableName) const; QStringList values(const QString &variableName, const ProFile *pro) const; QStringList absolutePathValues(const QString &variable, const QString &baseDirectory) const;