diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-01-28 12:48:53 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-02-03 17:43:30 +0100 |
| commit | 10afe69c16e641909901159bfad5b233d641151a (patch) | |
| tree | 385b52acec49cc7538639db36187956e918b9ff5 /qmake | |
| parent | 91b12a1add357bd79121f5025c9e3b5be29c5cd7 (diff) | |
Use a QMap instead of a QHash for the ProValueMap
qmake relies heavily on stable references to nodes stored within the
container. QHash in Qt6 doesn't offer that guarantee, so use a QMap
instead, that supports this.
Change-Id: Ifcf3d67098585ea26f4e02f4570d407a56e33c9c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/library/proitems.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/library/proitems.h b/qmake/library/proitems.h index 4569d7c3ff..01370959c7 100644 --- a/qmake/library/proitems.h +++ b/qmake/library/proitems.h @@ -35,6 +35,7 @@ #include <qstring.h> #include <qvector.h> #include <qhash.h> +#include <qmap.h> QT_BEGIN_NAMESPACE @@ -316,7 +317,7 @@ Q_DECLARE_TYPEINFO(ProStringList, Q_MOVABLE_TYPE); inline ProStringList operator+(const ProStringList &one, const ProStringList &two) { ProStringList ret = one; ret += two; return ret; } -typedef QHash<ProKey, ProStringList> ProValueMap; +typedef QMap<ProKey, ProStringList> ProValueMap; // These token definitions affect both ProFileEvaluator and ProWriter enum ProToken { |