diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-21 14:47:08 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-05 03:03:08 +0200 |
| commit | 09df6bec737bd9b59dc26bd76e891634aab4ab22 (patch) | |
| tree | 003540974382af4bc9744de6088b95c3438e113a /qmake/property.cpp | |
| parent | 19e3441b7c6dfb25e3dd8c019b681922404a7aae (diff) | |
pre-initialize more invariant properties
Change-Id: I0add2e7ead5a3d63124ef7ff85362895dd64bd23
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/property.cpp')
| -rw-r--r-- | qmake/property.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/qmake/property.cpp b/qmake/property.cpp index 99bfbfc594..258a2cf1d0 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -85,6 +85,10 @@ QMakeProperty::QMakeProperty() : settings(0) } m_values[name] = val; } + m_values["QMAKE_VERSION"] = qmake_version(); +#ifdef QT_VERSION_STR + m_values["QT_VERSION"] = QT_VERSION_STR; +#endif } QMakeProperty::~QMakeProperty() @@ -107,12 +111,6 @@ QMakeProperty::value(const QString &v) QString val = m_values.value(v); if (!val.isNull()) 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(); if (!settings->contains(v)) |