diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2020-07-06 22:54:34 +0200 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-07-07 09:45:41 +0000 |
commit | 74a93aa2e8e5394278f92dbc99acfd10b745316d (patch) | |
tree | 885631c0d80f81233ad53d65b94b3cfd75ea8d3d /share | |
parent | 60fb78733d6218457804ba6e9860e7a25b41e166 (diff) |
protobuf: get rid of the unused 'product' parameter
Change-Id: I1f1c5d04d2c3e87c39eb668e4dc3feebb9fc452c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share')
-rw-r--r-- | share/qbs/modules/protobuf/cpp/protobufcpp.qbs | 8 | ||||
-rw-r--r-- | share/qbs/modules/protobuf/objc/protobufobjc.qbs | 4 | ||||
-rw-r--r-- | share/qbs/modules/protobuf/protobuf.js | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/share/qbs/modules/protobuf/cpp/protobufcpp.qbs b/share/qbs/modules/protobuf/cpp/protobufcpp.qbs index 1af622339..8695d7469 100644 --- a/share/qbs/modules/protobuf/cpp/protobufcpp.qbs +++ b/share/qbs/modules/protobuf/cpp/protobufcpp.qbs @@ -55,13 +55,13 @@ ProtobufBase { outputFileTags: ["hpp", "cpp"] outputArtifacts: { var result = [ - HelperFunctions.cppArtifact(input.protobuf.cpp, product, input, "hpp", ".pb.h"), - HelperFunctions.cppArtifact(input.protobuf.cpp, product, input, "cpp", ".pb.cc") + HelperFunctions.cppArtifact(input.protobuf.cpp, input, "hpp", ".pb.h"), + HelperFunctions.cppArtifact(input.protobuf.cpp, input, "cpp", ".pb.cc") ]; if (input.fileTags.contains("protobuf.grpc")) { result.push( - HelperFunctions.cppArtifact(input.protobuf.cpp, product, input, "hpp", ".grpc.pb.h"), - HelperFunctions.cppArtifact(input.protobuf.cpp, product, input, "cpp", ".grpc.pb.cc")); + HelperFunctions.cppArtifact(input.protobuf.cpp, input, "hpp", ".grpc.pb.h"), + HelperFunctions.cppArtifact(input.protobuf.cpp, input, "cpp", ".grpc.pb.cc")); } return result; diff --git a/share/qbs/modules/protobuf/objc/protobufobjc.qbs b/share/qbs/modules/protobuf/objc/protobufobjc.qbs index 99f5ba00a..7bc7846da 100644 --- a/share/qbs/modules/protobuf/objc/protobufobjc.qbs +++ b/share/qbs/modules/protobuf/objc/protobufobjc.qbs @@ -24,8 +24,8 @@ ProtobufBase { outputFileTags: ["hpp", "objc"] outputArtifacts: { return [ - HelperFunctions.objcArtifact(input.protobuf.objc, product, input, "hpp", ".pbobjc.h"), - HelperFunctions.objcArtifact(input.protobuf.objc, product, input, "objc", ".pbobjc.m") + HelperFunctions.objcArtifact(input.protobuf.objc, input, "hpp", ".pbobjc.h"), + HelperFunctions.objcArtifact(input.protobuf.objc, input, "objc", ".pbobjc.m") ]; } diff --git a/share/qbs/modules/protobuf/protobuf.js b/share/qbs/modules/protobuf/protobuf.js index 8745d59fb..6e2923048 100644 --- a/share/qbs/modules/protobuf/protobuf.js +++ b/share/qbs/modules/protobuf/protobuf.js @@ -53,7 +53,7 @@ function toCamelCase(str){ }).join(''); } -function getOutputDir(module, product, input) { +function getOutputDir(module, input) { var outputDir = module.outputDir; var importPaths = module.importPaths; if (importPaths.length !== 0) { @@ -69,8 +69,8 @@ function getOutputDir(module, product, input) { return outputDir; } -function cppArtifact(module, product, input, tag, suffix) { - var outputDir = getOutputDir(module, product, input); +function cppArtifact(module, input, tag, suffix) { + var outputDir = getOutputDir(module, input); return { fileTags: [tag], filePath: outputDir + "/" + FileInfo.baseName(input.fileName) + suffix, @@ -81,8 +81,8 @@ function cppArtifact(module, product, input, tag, suffix) { }; } -function objcArtifact(module, product, input, tag, suffix) { - var outputDir = getOutputDir(module, product, input); +function objcArtifact(module, input, tag, suffix) { + var outputDir = getOutputDir(module, input); return { fileTags: [tag], filePath: outputDir + "/" + toCamelCase(FileInfo.baseName(input.fileName)) + suffix, |