diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-23 19:23:02 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-24 14:01:38 +0000 |
| commit | 89868ee2b9093ecf40602ae302b991d6a60014b0 (patch) | |
| tree | d2e85d97071285f918670b5cf26bbc5c6486b4bf /src/shared | |
| parent | 2cb7c81e620d224d386860a637dc889acb15435e (diff) | |
simplify the qt4 fallback in the external property parsing
only qmakes from qt4 don't have QT_HOST_* properties. and as they don't
have _any_ of them, the fallback can be simplified.
Change-Id: Id2ccbc7c01a56b894841980b0bc45bd84d160c54
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/proparser/qmakeglobals.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/shared/proparser/qmakeglobals.cpp b/src/shared/proparser/qmakeglobals.cpp index 3ca949cb96..c9c3b2d697 100644 --- a/src/shared/proparser/qmakeglobals.cpp +++ b/src/shared/proparser/qmakeglobals.cpp @@ -353,20 +353,20 @@ void QMakeGlobals::parseProperties(const QByteArray &data, QHash<ProKey, ProStri } if (name.startsWith(QLatin1String("QT_INSTALL_"))) { if (plain) { + if (name == QLatin1String("QT_INSTALL_PREFIX") + || name == QLatin1String("QT_INSTALL_DATA") + || name == QLatin1String("QT_INSTALL_BINS")) { + // Qt4 fallback + QString hname = name; + hname.replace(3, 7, QLatin1String("HOST")); + properties.insert(ProKey(hname), value); + properties.insert(ProKey(hname + QLatin1String("/get")), value); + properties.insert(ProKey(hname + QLatin1String("/src")), value); + } properties.insert(ProKey(name + QLatin1String("/raw")), value); properties.insert(ProKey(name + QLatin1String("/get")), value); } properties.insert(ProKey(name + QLatin1String("/src")), value); - if (name == QLatin1String("QT_INSTALL_PREFIX") - || name == QLatin1String("QT_INSTALL_DATA") - || name == QLatin1String("QT_INSTALL_BINS")) { - name.replace(3, 7, QLatin1String("HOST")); - if (plain) { - properties.insert(ProKey(name), value); - properties.insert(ProKey(name + QLatin1String("/get")), value); - } - properties.insert(ProKey(name + QLatin1String("/src")), value); - } } else if (name.startsWith(QLatin1String("QT_HOST_"))) { if (plain) properties.insert(ProKey(name + QLatin1String("/get")), value); |