diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-24 13:33:14 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-24 14:01:25 +0000 |
| commit | 8a69c254757eab7852443b5e4bd5eafb68908d3d (patch) | |
| tree | 4e2d967e2c5d3f4bf53c595c7f00764106c5609c /src/shared | |
| parent | 8288ca1251fd49b10457b8f97e02e26f22c6ad31 (diff) | |
BaseQtVersion: use QMakeEvaluator's native format for m_versionInfo
Change-Id: I926bc97fe6fa510ac5a8fe77b64014333a69bd04
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/proparser/qmakeglobals.cpp | 7 | ||||
| -rw-r--r-- | src/shared/proparser/qmakeglobals.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/shared/proparser/qmakeglobals.cpp b/src/shared/proparser/qmakeglobals.cpp index f3600b33e0..5aa60c6f77 100644 --- a/src/shared/proparser/qmakeglobals.cpp +++ b/src/shared/proparser/qmakeglobals.cpp @@ -367,13 +367,6 @@ bool QMakeGlobals::initProperties() } return true; } -#else -void QMakeGlobals::setProperties(const QHash<QString, QString> &props) -{ - QHash<QString, QString>::ConstIterator it = props.constBegin(), eit = props.constEnd(); - for (; it != eit; ++it) - properties.insert(ProKey(it.key()), ProString(it.value())); -} #endif #endif // QT_BUILD_QMAKE diff --git a/src/shared/proparser/qmakeglobals.h b/src/shared/proparser/qmakeglobals.h index 9942113681..82fad78b88 100644 --- a/src/shared/proparser/qmakeglobals.h +++ b/src/shared/proparser/qmakeglobals.h @@ -126,7 +126,6 @@ public: # ifdef PROEVALUATOR_INIT_PROPS bool initProperties(); # else - void setProperties(const QHash<QString, QString> &props); void setProperties(const QHash<ProKey, ProString> &props) { properties = props; } # endif ProString propertyValue(const ProKey &name) const { return properties.value(name); } |