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