Utils: Collapse most of porting,h

Taking the Qt 6 branches, leaving some dummies until downstream
adapted.

Change-Id: Ib9b86568d73c341c8f740ba497c3cbfab830d8a1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

3 files changed, 7 insertions, 7 deletions

diff --git a/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp b/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
index 47706f91fc..c9e01ad8a4 100644
--- a/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
+++ b/src/libs/modelinglib/qmt/style/defaultstyleengine.cpp
@@ -83,7 +83,7 @@ public:
     ObjectVisuals m_objectVisuals;
 };
 
-Utils::QHashValueType qHash(const ObjectStyleKey &styleKey)
+size_t qHash(const ObjectStyleKey &styleKey)
 {
     return ::qHash(styleKey.m_elementType) ^ qHash(styleKey.m_objectVisuals);
 }
@@ -107,7 +107,7 @@ public:
     DObject::VisualPrimaryRole m_visualPrimaryRole = DObject::PrimaryRoleNormal;
 };
 
-Utils::QHashValueType qHash(const RelationStyleKey &styleKey)
+size_t qHash(const RelationStyleKey &styleKey)
 {
     return ::qHash(styleKey.m_elementType) ^ ::qHash(styleKey.m_visualPrimaryRole);
 }
@@ -128,7 +128,7 @@ public:
     DAnnotation::VisualRole m_visualRole = DAnnotation::RoleNormal;
 };
 
-Utils::QHashValueType qHash(const AnnotationStyleKey &styleKey)
+size_t qHash(const AnnotationStyleKey &styleKey)
 {
     return ::qHash(styleKey.m_visualRole);
 }
@@ -143,7 +143,7 @@ class BoundaryStyleKey
 {
 };
 
-Utils::QHashValueType qHash(const BoundaryStyleKey &styleKey)
+size_t qHash(const BoundaryStyleKey &styleKey)
 {
     Q_UNUSED(styleKey)
 
@@ -163,7 +163,7 @@ class SwimlaneStyleKey
 {
 };
 
-Utils::QHashValueType qHash(const SwimlaneStyleKey &styleKey)
+size_t qHash(const SwimlaneStyleKey &styleKey)
 {
     Q_UNUSED(styleKey)
 
diff --git a/src/libs/modelinglib/qmt/style/objectvisuals.cpp b/src/libs/modelinglib/qmt/style/objectvisuals.cpp
index 7db69f6965..77e665bd32 100644
--- a/src/libs/modelinglib/qmt/style/objectvisuals.cpp
+++ b/src/libs/modelinglib/qmt/style/objectvisuals.cpp
@@ -82,7 +82,7 @@ bool operator==(const ObjectVisuals &lhs, const ObjectVisuals &rhs)
             && lhs.depth() == rhs.depth();
 }
 
-Utils::QHashValueType qHash(const ObjectVisuals &objectVisuals)
+size_t qHash(const ObjectVisuals &objectVisuals)
 {
     return ::qHash(static_cast<int>(objectVisuals.visualPrimaryRole()))
             ^ ::qHash(static_cast<int>(objectVisuals.visualSecondaryRole()))
diff --git a/src/libs/modelinglib/qmt/style/objectvisuals.h b/src/libs/modelinglib/qmt/style/objectvisuals.h
index dcc4bee623..95fc21f2e4 100644
--- a/src/libs/modelinglib/qmt/style/objectvisuals.h
+++ b/src/libs/modelinglib/qmt/style/objectvisuals.h
@@ -62,6 +62,6 @@ private:
 };
 
 bool operator==(const ObjectVisuals &lhs, const ObjectVisuals &rhs);
-Utils::QHashValueType qHash(const ObjectVisuals &objectVisuals);
+size_t qHash(const ObjectVisuals &objectVisuals);
 
 } // namespace qmt