From 09df6bec737bd9b59dc26bd76e891634aab4ab22 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 21 Aug 2012 14:47:08 +0200 Subject: pre-initialize more invariant properties Change-Id: I0add2e7ead5a3d63124ef7ff85362895dd64bd23 Reviewed-by: Joerg Bornemann --- qmake/property.cpp | 10 ++++------ 1 file 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)) -- cgit v1.2.3