From 4e89092251bb5c956ac622c14dc8cbd29c68fc3a Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 3 Jan 2023 08:52:01 +0100 Subject: More compile fix with recent Qt 6 Mostly by backporting Creator master hunks. It still compiles with Qt 5.15. Change-Id: I14d2e33c3ca2368cb848748d5f5b41aa47801f72 Reviewed-by: Eike Ziller --- src/libs/languageserverprotocol/servercapabilities.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/libs/languageserverprotocol/servercapabilities.cpp') diff --git a/src/libs/languageserverprotocol/servercapabilities.cpp b/src/libs/languageserverprotocol/servercapabilities.cpp index ba8a6836ac..65c37bee59 100644 --- a/src/libs/languageserverprotocol/servercapabilities.cpp +++ b/src/libs/languageserverprotocol/servercapabilities.cpp @@ -342,10 +342,12 @@ bool ServerCapabilities::SemanticHighlightingServerCapabilities::isValid() const { return contains(scopesKey) && value(scopesKey).isArray() && Utils::allOf(value(scopesKey).toArray(), [](const QJsonValue &array) { -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - return array.isArray() && Utils::allOf(array.toArray(), &QJsonValue::isString); -#else +#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) + return array.isArray() && Utils::allOf(array.toArray(), &QJsonValueConstRef::isString); +#elif QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) return array.isArray() && Utils::allOf(array.toArray(), &QJsonValueRef::isString); +#else + return array.isArray() && Utils::allOf(array.toArray(), &QJsonValue::isString); #endif }); } -- cgit v1.2.1