diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-01 14:39:21 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-01 14:17:03 +0000 |
| commit | 09f8bd3ac0dca7e20be0f17f95df37bdc1211536 (patch) | |
| tree | 7050611490cfbde92bfd4529e3a4771d90fe057e /share | |
| parent | eb1f85a9718c8ad0c1ab056a39123127fdd4d10b (diff) | |
Update QML typeinfo for qbs files
Change-Id: I410db00dde848a6fab9078ff701fe3666b42dcf3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/qml-type-descriptions/qbs-bundle.json | 32 | ||||
| -rw-r--r-- | share/qtcreator/qml-type-descriptions/qbs.qmltypes | 4 |
2 files changed, 29 insertions, 7 deletions
diff --git a/share/qtcreator/qml-type-descriptions/qbs-bundle.json b/share/qtcreator/qml-type-descriptions/qbs-bundle.json index a6f70ed792..cf230cdefe 100644 --- a/share/qtcreator/qml-type-descriptions/qbs-bundle.json +++ b/share/qtcreator/qml-type-descriptions/qbs-bundle.json @@ -1,14 +1,32 @@ { "name": "qbs", "searchPaths": [ - "$(QBS_IMPORT_PATH)"], + "$(QBS_IMPORT_PATH)" + ], "installPaths": [ - "$(QBS_IMPORT_PATH)"], + "$(QBS_IMPORT_PATH)" + ], "implicitImports": [ - "__javascriptQt5__"], + "__javascriptQt5__" + ], "supportedImports": [ - "qbs.base 1.0", - "qbs 1.0", - "qbs.fileinfo 1.0", - "qbs.probe 1.0"] + "qbs", + "qbs.BinaryFile", + "qbs.BundleTools", + "qbs.DarwinTools", + "qbs.Environment", + "qbs.File", + "qbs.FileInfo", + "qbs.ModUtils", + "qbs.PathTools", + "qbs.Probes", + "qbs.Process", + "qbs.PropertyList", + "qbs.TemporaryDir", + "qbs.TextFile", + "qbs.UnixUtils", + "qbs.Utilities", + "qbs.WindowsUtils", + "qbs.Xml" + ] } diff --git a/share/qtcreator/qml-type-descriptions/qbs.qmltypes b/share/qtcreator/qml-type-descriptions/qbs.qmltypes index 718baa6a04..4038d271cb 100644 --- a/share/qtcreator/qml-type-descriptions/qbs.qmltypes +++ b/share/qtcreator/qml-type-descriptions/qbs.qmltypes @@ -60,6 +60,7 @@ Module { Property { name: "fileTags"; type: "string"; isList: true } Property { name: "fileTagsFilter"; type: "string"; isList: true } Property { name: "files"; type: "string"; isList: true } + Property { name: "filesAreTargets"; type: "bool" } Property { name: "name"; type: "string" } Property { name: "overrideTags"; type: "bool" } Property { name: "prefix"; type: "string" } @@ -72,6 +73,7 @@ Module { Property { name: "condition"; type: "bool" } Property { name: "name"; type: "string" } Property { name: "present"; type: "bool" } + Property { name: "priority"; type: "int" } Property { name: "setupBuildEnvironment"; type: "QVariant" } Property { name: "setupRunEnvironment"; type: "QVariant" } Property { name: "validate"; type: "bool" } @@ -187,6 +189,7 @@ Module { name: "SubProject" exports: [ "qbs/SubProject 1.0" ] prototype: "QQuickItem" + Property { name: "condition"; type: "bool" } Property { name: "filePath"; type: "string" } Property { name: "inheritProperties"; type: "bool" } } @@ -201,3 +204,4 @@ Module { Property { name: "prepare"; type: "QVariant" } } } + |