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

move qmake property hash to option object

that way they are auto-inherited by nested parsers, and it's the right
thing to do anyway.
parent f50952f1
......@@ -46,7 +46,7 @@ ProFileReader::~ProFileReader()
}
void ProFileReader::setQtVersion(QtVersion *qtVersion) {
addProperties(qtVersion->versionInfo());
m_option.properties = qtVersion->versionInfo();
}
bool ProFileReader::readProFile(const QString &fileName)
......
......@@ -216,7 +216,6 @@ public:
QHash<QString, QStringList> m_valuemap; // VariableName must be us-ascii, the content however can be non-us-ascii.
QHash<const ProFile*, QHash<QString, QStringList> > m_filevaluemap; // Variables per include file
QHash<QString, QString> m_properties;
QString m_outputDir;
bool m_definingTest;
......@@ -1252,8 +1251,8 @@ QStringList ProFileEvaluator::Private::qmakeFeaturePaths() const
QString ProFileEvaluator::Private::propertyValue(const QString &name, bool complain) const
{
if (m_properties.contains(name))
return m_properties.value(name);
if (m_option->properties.contains(name))
return m_option->properties.value(name);
if (name == QLatin1String("QMAKE_MKSPECS"))
return qmakeMkspecPaths().join(m_option->dirlist_sep);
if (name == QLatin1String("QMAKE_VERSION"))
......@@ -2843,11 +2842,6 @@ QString ProFileEvaluator::propertyValue(const QString &name) const
return d->propertyValue(name);
}
void ProFileEvaluator::addProperties(const QHash<QString, QString> &properties)
{
updateHash(&(d->m_properties), properties);
}
void ProFileEvaluator::logMessage(const QString &message)
{
if (d->m_verbose && !d->m_skipLevel)
......
......@@ -70,6 +70,7 @@ public:
QString dirlist_sep;
QString qmakespec;
QString cachefile;
QHash<QString, QString> properties;
enum TARG_MODE { TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE, TARG_MAC9_MODE, TARG_QNX6_MODE };
TARG_MODE target_mode;
......@@ -110,7 +111,6 @@ public:
bool queryProFile(ProFile *pro, const QString &content); // the same as above but the content is read from "content" string, not from filesystem
bool accept(ProFile *pro);
void addProperties(const QHash<QString, QString> &properties);
QStringList values(const QString &variableName) const;
QStringList values(const QString &variableName, const ProFile *pro) const;
QStringList absolutePathValues(const QString &variable, const QString &baseDirectory) const;
......
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