aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2022-01-11 14:03:33 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2022-01-18 10:52:47 +0200
commit1fc6e71ad1a2b9772ff5432139d673db731257c9 (patch)
treef6eef730304f74b5494398d67f964902f9756ac7
parent7001d83524e4eb61192f9388eba331ae02cc585b (diff)
Add support for qtlanguageserver
Implementation of the Language Server Protocol which is used by QtDeclarative to provide QML language server. Fixes: QTBUG-99780 Change-Id: I600ca8c6738d7b9aba8d275edb85f642aee7eb47 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit ddce6334cfc552cdea4a2f67e56dd15b74834e14)
-rw-r--r--recipes-qt/qt6/qt6-git.inc1
-rw-r--r--recipes-qt/qt6/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt6/qtlanguageserver_git.bb16
3 files changed, 18 insertions, 1 deletions
diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc
index ba467d8..d85d666 100644
--- a/recipes-qt/qt6/qt6-git.inc
+++ b/recipes-qt/qt6/qt6-git.inc
@@ -37,6 +37,7 @@ SRCREV_qtopcua = "f343b587c2f8f326bd05565785a7db2a9ae9eccc"
SRCREV_qtpositioning = "b2f4536c2fe44af9d36a91816182a1c0cbad3f17"
SRCREV_qtquick3d = "48b57e0e036d6f470e9f3bb9a1a2c4a0bbfe59f6"
SRCREV_qtquick3d-assimp = "0d070876e813d36ebc87c9a1e06c0ff7d6cfd676"
+SRCREV_qtlanguageserver = "763f45bc9510989bc56cb6c4b4a95e16dcfb1598"
SRCREV_qtquickdesigner-components = "4fb0164bc10a6741c917a7386fe5a494093ee70e"
SRCREV_qtquicktimeline = "f12e80f6ce0bab00b28c221474eef8f6b83e2cc8"
SRCREV_qtremoteobjects = "afce39816f1c6debda4f22b4a1df6d99f779b367"
diff --git a/recipes-qt/qt6/qtdeclarative_git.bb b/recipes-qt/qt6/qtdeclarative_git.bb
index 224afc4..b317d85 100644
--- a/recipes-qt/qt6/qtdeclarative_git.bb
+++ b/recipes-qt/qt6/qtdeclarative_git.bb
@@ -16,7 +16,7 @@ SRC_URI += "\
file://0001-tests-disable-failing-tests.patch \
"
-DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native"
+DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native qtlanguageserver"
BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt6/qtlanguageserver_git.bb b/recipes-qt/qt6/qtlanguageserver_git.bb
new file mode 100644
index 0000000..41388a5
--- /dev/null
+++ b/recipes-qt/qt6/qtlanguageserver_git.bb
@@ -0,0 +1,16 @@
+LICENSE = "GFDL-1.3 & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = " \
+ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+ file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
+ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
+ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
+"
+
+inherit qt6-cmake
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6.inc
+
+DEPENDS += "qtbase"
+
+BBCLASSEXTEND = "native nativesdk"