From d358589004aed1f0615b401ba7186d6fed58cbc3 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 9 Jan 2024 09:52:58 +0100 Subject: [PATCH] LSP: Fix building with Qt less than 6.4 Change-Id: I25f8be3a256328443dd42d72d05ce5b6b717bded Reviewed-by: David Schulz --- src/libs/languageserverprotocol/jsonkeys.h | 10 ++++++++++ src/libs/languageserverprotocol/jsonobject.h | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/src/libs/languageserverprotocol/jsonkeys.h b/src/libs/languageserverprotocol/jsonkeys.h index 6eb6e4b35e8..e5b07c064c0 100644 --- a/src/libs/languageserverprotocol/jsonkeys.h +++ b/src/libs/languageserverprotocol/jsonkeys.h @@ -3,11 +3,21 @@ #pragma once +#include + +#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) #include +#else +#include +#endif namespace LanguageServerProtocol { +#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) using Key = QLatin1StringView; +#else +using Key = QLatin1String; +#endif constexpr Key actionsKey{"actions"}; constexpr Key activeParameterKey{"activeParameter"}; diff --git a/src/libs/languageserverprotocol/jsonobject.h b/src/libs/languageserverprotocol/jsonobject.h index ce73e1c17ec..6c5f7510b79 100644 --- a/src/libs/languageserverprotocol/jsonobject.h +++ b/src/libs/languageserverprotocol/jsonobject.h @@ -43,7 +43,11 @@ public: const_iterator end() const { return m_jsonObject.end(); } protected: +#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) using Key = QLatin1StringView; +#else + using Key = QLatin1String; +#endif iterator insert(const Key key, const JsonObject &value); iterator insert(const Key key, const QJsonValue &value);