diff options
Diffstat (limited to 'qmake/property.cpp')
| -rw-r--r-- | qmake/property.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/qmake/property.cpp b/qmake/property.cpp index 358d7f3a3c..32b6729c13 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -5,6 +5,7 @@ #include <qdir.h> #include <qsettings.h> +#include <qtversion.h> #include <qmakelibraryinfo.h> #include <qstringlist.h> #include <stdio.h> @@ -75,7 +76,9 @@ void QMakeProperty::reload() #ifdef QMAKE_VERSION_STR m_values["QMAKE_VERSION"] = ProString(QMAKE_VERSION_STR); #endif - m_values["QT_VERSION"] = ProString(qVersion()); +#ifdef QT_VERSION_STR + m_values["QT_VERSION"] = ProString(QT_VERSION_STR); +#endif } QMakeProperty::~QMakeProperty() @@ -141,8 +144,10 @@ int QMakeProperty::queryProperty(const QStringList &optionProperties, #ifdef QMAKE_VERSION_STR specialProps.append("QMAKE_VERSION"); #endif +#ifdef QT_VERSION_STR specialProps.append("QT_VERSION"); - for (const QString &prop : qAsConst(specialProps)) { +#endif + for (const QString &prop : std::as_const(specialProps)) { ProString val = value(ProKey(prop)); ProString pval = value(ProKey(prop + "/raw")); ProString gval = value(ProKey(prop + "/get")); |