protobuf: Do not call outputDir() that often

Change-Id: I1f436eb2d15393fc010a4ab29f879ae0828b0cc3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

3 files changed, 10 insertions, 10 deletions

diff --git a/share/qbs/modules/protobuf/cpp/protobufcpp.qbs b/share/qbs/modules/protobuf/cpp/protobufcpp.qbs
index 2697eb227..bd3d94929 100644
--- a/share/qbs/modules/protobuf/cpp/protobufcpp.qbs
+++ b/share/qbs/modules/protobuf/cpp/protobufcpp.qbs
@@ -54,14 +54,15 @@ ProtobufBase {
         inputs: ["protobuf.input", "protobuf.grpc"]
         outputFileTags: ["hpp", "cpp"]
         outputArtifacts: {
+            var outputDir = HelperFunctions.getOutputDir(input.protobuf.cpp, input);
             var result = [
-                        HelperFunctions.cppArtifact(input.protobuf.cpp, input, "hpp", ".pb.h"),
-                        HelperFunctions.cppArtifact(input.protobuf.cpp, input, "cpp", ".pb.cc")
+                        HelperFunctions.cppArtifact(outputDir, input, "hpp", ".pb.h"),
+                        HelperFunctions.cppArtifact(outputDir, input, "cpp", ".pb.cc")
                     ];
             if (input.fileTags.contains("protobuf.grpc")) {
                 result.push(
-                        HelperFunctions.cppArtifact(input.protobuf.cpp, input, "hpp", ".grpc.pb.h"),
-                        HelperFunctions.cppArtifact(input.protobuf.cpp, input, "cpp", ".grpc.pb.cc"));
+                        HelperFunctions.cppArtifact(outputDir, input, "hpp", ".grpc.pb.h"),
+                        HelperFunctions.cppArtifact(outputDir, 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 67057fb26..9a910bb72 100644
--- a/share/qbs/modules/protobuf/objc/protobufobjc.qbs
+++ b/share/qbs/modules/protobuf/objc/protobufobjc.qbs
@@ -23,9 +23,10 @@ ProtobufBase {
         inputs: ["protobuf.input"]
         outputFileTags: ["hpp", "objc"]
         outputArtifacts: {
+            var outputDir = HelperFunctions.getOutputDir(input.protobuf.objc, input);
             return [
-                HelperFunctions.objcArtifact(input.protobuf.objc, input, "hpp", ".pbobjc.h"),
-                HelperFunctions.objcArtifact(input.protobuf.objc, input, "objc", ".pbobjc.m")
+                HelperFunctions.objcArtifact(outputDir, input, "hpp", ".pbobjc.h"),
+                HelperFunctions.objcArtifact(outputDir, input, "objc", ".pbobjc.m")
             ];
         }
 
diff --git a/share/qbs/modules/protobuf/protobuf.js b/share/qbs/modules/protobuf/protobuf.js
index 3c70dfef0..8ab535abd 100644
--- a/share/qbs/modules/protobuf/protobuf.js
+++ b/share/qbs/modules/protobuf/protobuf.js
@@ -69,8 +69,7 @@ function getOutputDir(module, input)  {
     return outputDir;
 }
 
-function cppArtifact(module, input, tag, suffix) {
-    var outputDir = getOutputDir(module, input);
+function cppArtifact(outputDir, input, tag, suffix) {
     return {
         fileTags: [tag],
         filePath: FileInfo.joinPaths(outputDir, FileInfo.baseName(input.fileName) + suffix),
@@ -81,8 +80,7 @@ function cppArtifact(module, input, tag, suffix) {
     };
 }
 
-function objcArtifact(module, input, tag, suffix) {
-    var outputDir = getOutputDir(module, input);
+function objcArtifact(outputDir, input, tag, suffix) {
     return {
         fileTags: [tag],
         filePath: FileInfo.joinPaths(