diff --git a/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.h b/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.h index 4ef1dbd4f6..8c276fb66b 100644 --- a/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.h +++ b/libraries/input-plugins/src/input-plugins/TouchscreenVirtualPadDevice.h @@ -15,7 +15,12 @@ #include #include "InputPlugin.h" #include +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) #include +#else +#include +#include +#endif #include "VirtualPadManager.h" class QTouchEvent; diff --git a/libraries/material-networking/src/material-networking/TextureCache.cpp b/libraries/material-networking/src/material-networking/TextureCache.cpp index 4831223fe9..64c3abb0d8 100644 --- a/libraries/material-networking/src/material-networking/TextureCache.cpp +++ b/libraries/material-networking/src/material-networking/TextureCache.cpp @@ -223,12 +223,14 @@ public: }; namespace std { +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) template <> struct hash { size_t operator()(const QByteArray& byteArray) const { return qHash(byteArray); } }; +#endif template <> struct hash { diff --git a/libraries/shared/src/RegisteredMetaTypes.h b/libraries/shared/src/RegisteredMetaTypes.h index 86e06d7f93..49a73d40c2 100644 --- a/libraries/shared/src/RegisteredMetaTypes.h +++ b/libraries/shared/src/RegisteredMetaTypes.h @@ -597,12 +597,14 @@ namespace std { } }; +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) template <> struct hash { size_t operator()(const QString& a) const { return qHash(a); } }; +#endif } /**jsdoc