1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pre-initialize more invariant properties

Browse Source 
Change-Id: I0add2e7ead5a3d63124ef7ff85362895dd64bd23
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-08-21 14:47:08 +02:00 committed by Qt by Nokia
parent 19e3441b7c
commit 09df6bec73
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qmake/property.cpp
View File

@ -85,6 +85,10 @@ QMakeProperty::QMakeProperty() : settings(0)
} }
m_values[name] = val; m_values[name] = val;
} }
m_values["QMAKE_VERSION"] = qmake_version();
#ifdef QT_VERSION_STR
m_values["QT_VERSION"] = QT_VERSION_STR;
#endif
} }
QMakeProperty::~QMakeProperty() QMakeProperty::~QMakeProperty()
@ -107,12 +111,6 @@ QMakeProperty::value(const QString &v)
QString val = m_values.value(v); QString val = m_values.value(v);
if (!val.isNull()) if (!val.isNull())
return val; return val;
else if(v == "QMAKE_VERSION")
return qmake_version();
#ifdef QT_VERSION_STR
else if(v == "QT_VERSION")
return QT_VERSION_STR;
#endif
initSettings(); initSettings();
if (!settings->contains(v)) if (!settings->contains(v))