diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-24 13:33:14 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-03-29 18:15:24 +0000 |
| commit | 13ab4c563dc33abc879d8f2a628b8a525e00e55a (patch) | |
| tree | 7898b07e14f99f6c47092b6b0d70f4633412856c /qmake | |
| parent | 85ae0f1f3e369e1d28af7b2ec963f63e177ecd11 (diff) | |
qmake: remove unnecessary QMakeGlobals::setProperties() overload
sync-up with qt-creator; no effect on qmake.
Change-Id: I926bc97fe6fa510ac5a8fe77b64014333a69bd04
(cherry picked from qtcreator/8a69c254757eab7852443b5e4bd5eafb68908d3d)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/library/qmakeglobals.cpp | 7 | ||||
| -rw-r--r-- | qmake/library/qmakeglobals.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/qmake/library/qmakeglobals.cpp b/qmake/library/qmakeglobals.cpp index d733d479cf..cab04fc239 100644 --- a/qmake/library/qmakeglobals.cpp +++ b/qmake/library/qmakeglobals.cpp @@ -370,13 +370,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/qmake/library/qmakeglobals.h b/qmake/library/qmakeglobals.h index 000f685b73..cf71a5afda 100644 --- a/qmake/library/qmakeglobals.h +++ b/qmake/library/qmakeglobals.h @@ -134,7 +134,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); } |