From 120218e0fd6bdc68fc95a6ff0924e8a5a4b50d37 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 15 Feb 2022 16:47:07 +0100 Subject: [PATCH] Update qbs submodule ... to HEAD of 1.22 branch. Change-Id: Ib15854a88b6265f341c42f2b62d67f914fb9e747 Reviewed-by: Qt CI Bot Reviewed-by: Reviewed-by: Christian Stenger --- share/qtcreator/qml-type-descriptions/qbs-bundle.json | 1 + share/qtcreator/qml-type-descriptions/qbs.qmltypes | 2 ++ src/shared/qbs | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/qml-type-descriptions/qbs-bundle.json b/share/qtcreator/qml-type-descriptions/qbs-bundle.json index cf230cdefee..7f0c6886911 100644 --- a/share/qtcreator/qml-type-descriptions/qbs-bundle.json +++ b/share/qtcreator/qml-type-descriptions/qbs-bundle.json @@ -19,6 +19,7 @@ "qbs.FileInfo", "qbs.ModUtils", "qbs.PathTools", + "qbs.PkgConfig", "qbs.Probes", "qbs.Process", "qbs.PropertyList", diff --git a/share/qtcreator/qml-type-descriptions/qbs.qmltypes b/share/qtcreator/qml-type-descriptions/qbs.qmltypes index bc4244b63fc..941697b02d2 100644 --- a/share/qtcreator/qml-type-descriptions/qbs.qmltypes +++ b/share/qtcreator/qml-type-descriptions/qbs.qmltypes @@ -133,6 +133,7 @@ Module { Property { name: "multiplexedType"; type: "string"; isList: true } Property { name: "name"; type: "string" } Property { name: "profiles"; type: "string"; isList: true } + Property { name: "qbsModuleProviders"; type: "string"; isList: true } Property { name: "qbsSearchPaths"; type: "string"; isList: true } Property { name: "targetName"; type: "string" } Property { name: "type"; type: "string"; isList: true } @@ -155,6 +156,7 @@ Module { Property { name: "minimumQbsVersion"; type: "string" } Property { name: "name"; type: "string" } Property { name: "profile"; type: "string" } + Property { name: "qbsModuleProviders"; type: "string"; isList: true } Property { name: "qbsSearchPaths"; type: "string"; isList: true } Property { name: "references"; type: "string"; isList: true } Property { name: "sourceDirectory"; type: "string" } diff --git a/src/shared/qbs b/src/shared/qbs index 768b6894a8d..29b15e594f5 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 768b6894a8d189158fed83cbc79d92d5484cb2e4 +Subproject commit 29b15e594f50314959ce9b63c4a39cc86e831475