diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-23 16:54:42 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-24 14:05:11 +0000 |
| commit | 19eaf87ef95a510351557119a955223a4aeea7b3 (patch) | |
| tree | 02911f170979138ac05409185d09f0679a45e0eb /src/shared/proparser | |
| parent | 61419e7bf0f3bff6dcf63876b05b72c56e60c2a8 (diff) | |
de-duplicate fallback paths in external qmake property parsing
Change-Id: I976ab923d9ef213800eabe7a9c331191abea9430
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/shared/proparser')
| -rw-r--r-- | src/shared/proparser/qmakeglobals.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/shared/proparser/qmakeglobals.cpp b/src/shared/proparser/qmakeglobals.cpp index ec029b8db0..3511320c8f 100644 --- a/src/shared/proparser/qmakeglobals.cpp +++ b/src/shared/proparser/qmakeglobals.cpp @@ -372,14 +372,12 @@ void QMakeGlobals::parseProperties(const QByteArray &data, QHash<ProKey, ProStri } properties.insert(ProKey(name + QLatin1String("/raw")), value); } - if (variant < PropGet) - properties.insert(ProKey(name + QLatin1String("/get")), value); - properties.insert(ProKey(name + QLatin1String("/src")), value); - } else if (name.startsWith(QLatin1String("QT_HOST_"))) { - if (variant < PropGet) - properties.insert(ProKey(name + QLatin1String("/get")), value); - properties.insert(ProKey(name + QLatin1String("/src")), value); + } else if (!name.startsWith(QLatin1String("QT_HOST_"))) { + continue; } + if (variant < PropGet) + properties.insert(ProKey(name + QLatin1String("/get")), value); + properties.insert(ProKey(name + QLatin1String("/src")), value); } } } |