diff options
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/languageserverprotocol/servercapabilities.cpp | 8 | ||||
| -rw-r--r-- | src/libs/qmleditorwidgets/easingpane/easinggraph.h | 3 |
2 files changed, 5 insertions, 6 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 }); } diff --git a/src/libs/qmleditorwidgets/easingpane/easinggraph.h b/src/libs/qmleditorwidgets/easingpane/easinggraph.h index 517ee7dc1e..b5f1d554e8 100644 --- a/src/libs/qmleditorwidgets/easingpane/easinggraph.h +++ b/src/libs/qmleditorwidgets/easingpane/easinggraph.h @@ -31,9 +31,6 @@ QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) - - class EasingGraph: public QWidget { Q_OBJECT |