More compile fix with recent Qt 66.0

Mostly by backporting Creator master hunks.

It still compiles with Qt 5.15.

Change-Id: I14d2e33c3ca2368cb848748d5f5b41aa47801f72
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

1 files changed, 5 insertions, 3 deletions

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
               });
 }