diff --git a/src/GUI/searchpointer.h b/src/GUI/searchpointer.h
index 5504061d..41d32b23 100644
--- a/src/GUI/searchpointer.h
+++ b/src/GUI/searchpointer.h
@@ -1,6 +1,8 @@
 #ifndef SEARCHPOINTER_H
 #define SEARCHPOINTER_H
 
+#include "common/config.h"
+
 template <class T>
 class SearchPointer
 {
@@ -16,7 +18,7 @@ private:
 };
 
 template <class T>
-inline uint qHash(const SearchPointer<T> &t)
+inline HASH_T qHash(const SearchPointer<T> &t)
 {
 	return ::qHash(*(t.data()));
 }
diff --git a/src/common/config.h b/src/common/config.h
index 9d92f267..b2558f92 100644
--- a/src/common/config.h
+++ b/src/common/config.h
@@ -6,4 +6,10 @@
 #define APP_NAME        "GPXSee"
 #define APP_HOMEPAGE    "http://www.gpxsee.org"
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#define HASH_T uint
+#else // QT6
+#define HASH_T size_t
+#endif // QT6
+
 #endif /* CONFIG_H */
diff --git a/src/data/dem.h b/src/data/dem.h
index 46e25b4e..6aaaa071 100644
--- a/src/data/dem.h
+++ b/src/data/dem.h
@@ -4,6 +4,7 @@
 #include <QString>
 #include <QCache>
 #include <QByteArray>
+#include "common/config.h"
 
 class QString;
 class Coordinates;
@@ -37,12 +38,12 @@ public:
 	static void setDir(const QString &path);
 	static qreal elevation(const Coordinates &c);
 
-	friend uint qHash(const Key &key);
+	friend HASH_T qHash(const Key &key);
 };
 
-inline uint qHash(const DEM::Key &key)
+inline HASH_T qHash(const DEM::Key &key)
 {
-	return (key.lon() ^ key.lat());
+	return (qHash(key.lon()) ^ qHash(key.lat()));
 }
 
 #endif // DEM_H
diff --git a/src/data/waypoint.h b/src/data/waypoint.h
index 4ce7e3de..40420c7f 100644
--- a/src/data/waypoint.h
+++ b/src/data/waypoint.h
@@ -6,6 +6,7 @@
 #include <QHash>
 #include <QVector>
 #include <QDebug>
+#include "common/config.h"
 #include "common/coordinates.h"
 #include "imageinfo.h"
 #include "link.h"
@@ -68,7 +69,7 @@ private:
 	static bool _show2ndElevation;
 };
 
-inline uint qHash(const Waypoint &key)
+inline HASH_T qHash(const Waypoint &key)
 {
 	return ::qHash(key.name());
 }
diff --git a/src/map/IMG/label.h b/src/map/IMG/label.h
index b20a7ca1..4336c77d 100644
--- a/src/map/IMG/label.h
+++ b/src/map/IMG/label.h
@@ -3,6 +3,7 @@
 
 #include <QString>
 #include <QDebug>
+#include "common/config.h"
 
 #define FIRST_SHIELD Label::Shield::USInterstate
 #define LAST_SHIELD  Label::Shield::Oval
@@ -52,9 +53,9 @@ private:
 	Shield _shield;
 };
 
-inline uint qHash(const Label::Shield &shield)
+inline HASH_T qHash(const Label::Shield &shield)
 {
-	return qHash(shield.text()) ^ shield.type();
+	return qHash(shield.text()) ^ qHash(shield.type());
 }
 
 #ifndef QT_NO_DEBUG
diff --git a/src/map/wmts.h b/src/map/wmts.h
index 66e6ad2e..237b034b 100644
--- a/src/map/wmts.h
+++ b/src/map/wmts.h
@@ -6,6 +6,7 @@
 #include <QSet>
 #include <QList>
 #include <QHash>
+#include "common/config.h"
 #include "common/rectc.h"
 #include "common/kv.h"
 #include "projection.h"
@@ -169,16 +170,16 @@ private:
 	bool _valid, _ready;
 	QString _errorString;
 
-	friend uint qHash(const WMTS::TileMatrix &key);
-	friend uint qHash(const WMTS::MatrixLimits &key);
+	friend HASH_T qHash(const WMTS::TileMatrix &key);
+	friend HASH_T qHash(const WMTS::MatrixLimits &key);
 };
 
-inline uint qHash(const WMTS::TileMatrix &key)
+inline HASH_T qHash(const WMTS::TileMatrix &key)
 {
 	return ::qHash(key.id);
 }
 
-inline uint qHash(const WMTS::MatrixLimits &key)
+inline HASH_T qHash(const WMTS::MatrixLimits &key)
 {
 	return ::qHash(key.id);
 }