diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-22 10:29:34 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-22 09:10:26 +0000 |
| commit | 1944b945750511648425d0427679672afa922dc8 (patch) | |
| tree | ecf6ae6aede60362456acec9e0c6830f19c84502 /share | |
| parent | 6a586555f601a37359f29f87453a2bddaefe01fe (diff) | |
Update qbs submodule
To HEAD of 1.12 branch.
Change-Id: I632c2f804ab333ba88211219d2fe3e8c246b3ebe
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/qml-type-descriptions/qbs.qmltypes | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/share/qtcreator/qml-type-descriptions/qbs.qmltypes b/share/qtcreator/qml-type-descriptions/qbs.qmltypes index 4038d271cb..056d94ffbe 100644 --- a/share/qtcreator/qml-type-descriptions/qbs.qmltypes +++ b/share/qtcreator/qml-type-descriptions/qbs.qmltypes @@ -36,6 +36,7 @@ Module { Property { name: "additionalProductTypes"; type: "string"; isList: true } Property { name: "condition"; type: "bool" } Property { name: "name"; type: "string" } + Property { name: "prefixMapping"; type: "QVariant" } Property { name: "present"; type: "bool" } Property { name: "setupBuildEnvironment"; type: "QVariant" } Property { name: "setupRunEnvironment"; type: "QVariant" } @@ -114,7 +115,6 @@ Module { Property { name: "multiplexed"; type: "bool" } Property { name: "multiplexedType"; type: "string"; isList: true } Property { name: "name"; type: "string" } - Property { name: "profile"; type: "string" } Property { name: "profiles"; type: "string"; isList: true } Property { name: "qbsSearchPaths"; type: "string"; isList: true } Property { name: "targetName"; type: "string" } @@ -146,6 +146,7 @@ Module { name: "Properties" exports: [ "qbs/Properties 1.0" ] prototype: "QQuickItem" + Property { name: "condition"; type: "bool" } } Component { name: "PropertyOptions" @@ -164,7 +165,9 @@ Module { Property { name: "auxiliaryInputs"; type: "string"; isList: true } Property { name: "condition"; type: "bool" } Property { name: "excludedAuxiliaryInputs"; type: "string"; isList: true } + Property { name: "excludedInputs"; type: "string"; isList: true } Property { name: "explicitlyDependsOn"; type: "string"; isList: true } + Property { name: "explicitlyDependsOnFromDependencies"; type: "string"; isList: true } Property { name: "inputs"; type: "string"; isList: true } Property { name: "inputsFromDependencies"; type: "string"; isList: true } Property { name: "multiplex"; type: "bool" } |