diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-07-26 23:42:01 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-07-27 19:22:16 +0000 |
| commit | fb7760cbd7896aaa00e05ece8f4c1a34c532d887 (patch) | |
| tree | 1eed6aa234c7eafef132c5c6e9f0e43e0f33dd60 /share | |
| parent | 34349e6574500e087ced56cc9504431b3e3b6469 (diff) | |
protobuf: remove deprecated properties
Change-Id: I871b7f46ffab880fa2a2762c2339907fe7d01f88
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/protobuf/protobuf.js | 4 | ||||
| -rw-r--r-- | share/qbs/modules/protobuf/protobufbase.qbs | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/share/qbs/modules/protobuf/protobuf.js b/share/qbs/modules/protobuf/protobuf.js index 8ab535abd..6a3950850 100644 --- a/share/qbs/modules/protobuf/protobuf.js +++ b/share/qbs/modules/protobuf/protobuf.js @@ -110,7 +110,7 @@ function doPrepare(module, product, input, outputs, lang) args.push(input.filePath); - var cmd = new Command(module._compilerPath, args); + var cmd = new Command(module.compilerPath, args); cmd.highlight = "codegen"; cmd.description = "generating " + lang + " files for " + input.fileName; return [cmd]; @@ -135,7 +135,7 @@ function doPrepareGrpc(module, product, input, outputs, lang) args.push(input.filePath); - var cmd = new Command(module._compilerPath, args); + var cmd = new Command(module.compilerPath, args); cmd.highlight = "codegen"; cmd.description = "generating " + lang + " files for " + input.fileName; return [cmd]; diff --git a/share/qbs/modules/protobuf/protobufbase.qbs b/share/qbs/modules/protobuf/protobufbase.qbs index cf050e345..aa7f28eb9 100644 --- a/share/qbs/modules/protobuf/protobufbase.qbs +++ b/share/qbs/modules/protobuf/protobufbase.qbs @@ -8,13 +8,6 @@ Module { property string compilerName: "protoc" property string compilerPath: compilerProbe.filePath - property string protocBinary - PropertyOptions { - name: "protocBinary" - description: "The path to the protoc binary. Deprecated, use compilerPath instead." - removalVersion: "1.18" - } - readonly property string _compilerPath: protocBinary ? protocBinary : compilerPath property pathList importPaths: [] property string _outputDir: product.buildDirectory + "/protobuf" |