diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-24 13:33:14 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-09-14 13:50:26 +0000 |
| commit | 7819a744afad11cc4573634d1bad3a7534d7220e (patch) | |
| tree | 165ad998c1625de03cf422c7ddc22a63524186da | |
| parent | d4b41fb8e7bc03e7c9145f0f11752a1a168305db (diff) | |
| download | qttools-7819a744afad11cc4573634d1bad3a7534d7220e.tar.gz | |
qmake: remove unnecessary QMakeGlobals::setProperties() overload
sync-up with qt-creator; no effect on qmake or lupdate.
Change-Id: I926bc97fe6fa510ac5a8fe77b64014333a69bd04
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from qtcreator/8a69c254757eab7852443b5e4bd5eafb68908d3d)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| -rw-r--r-- | src/linguist/shared/qmakeglobals.cpp | 7 | ||||
| -rw-r--r-- | src/linguist/shared/qmakeglobals.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/linguist/shared/qmakeglobals.cpp b/src/linguist/shared/qmakeglobals.cpp index 77eb7e53d..5a571e7d8 100644 --- a/src/linguist/shared/qmakeglobals.cpp +++ b/src/linguist/shared/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/src/linguist/shared/qmakeglobals.h b/src/linguist/shared/qmakeglobals.h index f9c3b20e4..8357b2db6 100644 --- a/src/linguist/shared/qmakeglobals.h +++ b/src/linguist/shared/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); } |