From 0fb16b8b80277a9c57adf7da006c6ba71aeae50a Mon Sep 17 00:00:00 2001
From: Denis Shienkov <denis.shienkov@gmail.com>
Date: Mon, 27 Sep 2021 17:33:45 +0300
Subject: Simplify all single-line 'prepare' scripts

Change-Id: I4e87e8aa98330c9d12a5d23cd2183edbb55d1a4d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 share/qbs/modules/cpp/GenericGCC.qbs | 36 +++++++++---------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

(limited to 'share/qbs/modules/cpp/GenericGCC.qbs')

diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index 47ab88a28..33f66e278 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -465,9 +465,7 @@ CppModule {
             return artifacts;
         }
 
-        prepare: {
-            return Gcc.prepareLinker.apply(Gcc, arguments);
-        }
+        prepare: Gcc.prepareLinker.apply(Gcc, arguments)
     }
 
     Rule {
@@ -555,9 +553,7 @@ CppModule {
             return artifacts;
         }
 
-        prepare: {
-            return Gcc.prepareLinker.apply(Gcc, arguments);
-        }
+        prepare: Gcc.prepareLinker.apply(Gcc, arguments)
     }
 
     Rule {
@@ -607,9 +603,7 @@ CppModule {
             return artifacts;
         }
 
-        prepare: {
-            return Gcc.prepareLinker.apply(Gcc, arguments);
-        }
+        prepare: Gcc.prepareLinker.apply(Gcc, arguments)
     }
 
     Rule {
@@ -636,9 +630,7 @@ CppModule {
             }];
         }
 
-        prepare: {
-            return Gcc.prepareCompiler.apply(Gcc, arguments);
-        }
+        prepare: Gcc.prepareCompiler.apply(Gcc, arguments)
     }
 
     Rule {
@@ -650,9 +642,7 @@ CppModule {
             filePath: FileInfo.joinPaths(Utilities.getHash(input.baseDir), input.fileName + input.cpp.objectSuffix)
         }
 
-        prepare: {
-            return Gcc.prepareAssembler.apply(Gcc, arguments);
-        }
+        prepare: Gcc.prepareAssembler.apply(Gcc, arguments)
     }
 
     Rule {
@@ -661,9 +651,7 @@ CppModule {
         auxiliaryInputs: ["hpp"]
         outputFileTags: Cpp.precompiledHeaderOutputTags("c", false)
         outputArtifacts: Cpp.precompiledHeaderOutputArtifacts(input, product, "c", false)
-        prepare: {
-            return Gcc.prepareCompiler.apply(Gcc, arguments);
-        }
+        prepare: Gcc.prepareCompiler.apply(Gcc, arguments)
     }
 
     Rule {
@@ -672,9 +660,7 @@ CppModule {
         auxiliaryInputs: ["hpp"]
         outputFileTags: Cpp.precompiledHeaderOutputTags("cpp", false)
         outputArtifacts: Cpp.precompiledHeaderOutputArtifacts(input, product, "cpp", false)
-        prepare: {
-            return Gcc.prepareCompiler.apply(Gcc, arguments);
-        }
+        prepare: Gcc.prepareCompiler.apply(Gcc, arguments)
     }
 
     Rule {
@@ -683,9 +669,7 @@ CppModule {
         auxiliaryInputs: ["hpp"]
         outputFileTags: Cpp.precompiledHeaderOutputTags("objc", false)
         outputArtifacts: Cpp.precompiledHeaderOutputArtifacts(input, product, "objc", false)
-        prepare: {
-            return Gcc.prepareCompiler.apply(Gcc, arguments);
-        }
+        prepare: Gcc.prepareCompiler.apply(Gcc, arguments)
     }
 
     Rule {
@@ -694,9 +678,7 @@ CppModule {
         auxiliaryInputs: ["hpp"]
         outputFileTags: Cpp.precompiledHeaderOutputTags("objcpp", false)
         outputArtifacts: Cpp.precompiledHeaderOutputArtifacts(input, product, "objcpp", false)
-        prepare: {
-            return Gcc.prepareCompiler.apply(Gcc, arguments);
-        }
+        prepare: Gcc.prepareCompiler.apply(Gcc, arguments)
     }
 
     FileTagger {
-- 
cgit v1.2.1