From 10afe69c16e641909901159bfad5b233d641151a Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 28 Jan 2020 12:48:53 +0100 Subject: 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 Reviewed-by: Joerg Bornemann --- qmake/library/proitems.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 #include #include +#include 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 ProValueMap; +typedef QMap ProValueMap; // These token definitions affect both ProFileEvaluator and ProWriter enum ProToken { -- cgit v1.2.3