diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2021-09-27 17:33:45 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2021-09-28 10:57:16 +0000 |
commit | 0fb16b8b80277a9c57adf7da006c6ba71aeae50a (patch) | |
tree | a25c991b8662262557ba224c1185df4bf66b5cb7 /share | |
parent | f25acf18be2cd917f71cad41123fafd42bbc8374 (diff) | |
download | qbs-0fb16b8b80277a9c57adf7da006c6ba71aeae50a.tar.gz |
Simplify all single-line 'prepare' scripts
Change-Id: I4e87e8aa98330c9d12a5d23cd2183edbb55d1a4d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share')
-rw-r--r-- | share/qbs/module-providers/Qt/templates/dbus.qbs | 8 | ||||
-rw-r--r-- | share/qbs/modules/cli/CLIModule.qbs | 12 | ||||
-rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 36 | ||||
-rw-r--r-- | share/qbs/modules/cpp/windows-clang-mingw.qbs | 2 | ||||
-rw-r--r-- | share/qbs/modules/cpp/windows-msvc-base.qbs | 20 |
5 files changed, 20 insertions, 58 deletions
diff --git a/share/qbs/module-providers/Qt/templates/dbus.qbs b/share/qbs/module-providers/Qt/templates/dbus.qbs index 6556e2c9b..90bbe2864 100644 --- a/share/qbs/module-providers/Qt/templates/dbus.qbs +++ b/share/qbs/module-providers/Qt/templates/dbus.qbs @@ -23,9 +23,7 @@ QtModule { fileTags: ["cpp"] } - prepare: { - return DBus.createCommands(product, input, outputs, "-a"); - } + prepare: DBus.createCommands(product, input, outputs, "-a") } Rule { @@ -41,9 +39,7 @@ QtModule { fileTags: ["cpp"] } - prepare: { - return DBus.createCommands(product, input, outputs, "-p"); - } + prepare: DBus.createCommands(product, input, outputs, "-p") } architectures: @archs@ diff --git a/share/qbs/modules/cli/CLIModule.qbs b/share/qbs/modules/cli/CLIModule.qbs index d0ca120ef..cea4c09ca 100644 --- a/share/qbs/modules/cli/CLIModule.qbs +++ b/share/qbs/modules/cli/CLIModule.qbs @@ -115,9 +115,7 @@ Module { "debugInfoSuffix")) } - prepare: { - return CLI.prepareCompiler(product, inputs, outputs.application[0]); - } + prepare: CLI.prepareCompiler(product, inputs, outputs.application[0]) } Rule { @@ -142,9 +140,7 @@ Module { "debugInfoSuffix")) } - prepare: { - return CLI.prepareCompiler(product, inputs, outputs.dynamiclibrary[0]); - } + prepare: CLI.prepareCompiler(product, inputs, outputs.dynamiclibrary[0]) } Rule { @@ -169,9 +165,7 @@ Module { "debugInfoSuffix")) } - prepare: { - return CLI.prepareCompiler(product, inputs, outputs["cli.netmodule"][0]); - } + prepare: CLI.prepareCompiler(product, inputs, outputs["cli.netmodule"][0]) } Rule { 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 { diff --git a/share/qbs/modules/cpp/windows-clang-mingw.qbs b/share/qbs/modules/cpp/windows-clang-mingw.qbs index fdc167c45..10d56cc85 100644 --- a/share/qbs/modules/cpp/windows-clang-mingw.qbs +++ b/share/qbs/modules/cpp/windows-clang-mingw.qbs @@ -94,6 +94,6 @@ MingwBaseModule { fileTags: ["obj"] } - prepare: MSVC.createRcCommand(product.cpp.rcFilePath, input, output); + prepare: MSVC.createRcCommand(product.cpp.rcFilePath, input, output) } } diff --git a/share/qbs/modules/cpp/windows-msvc-base.qbs b/share/qbs/modules/cpp/windows-msvc-base.qbs index 3629536af..df5211152 100644 --- a/share/qbs/modules/cpp/windows-msvc-base.qbs +++ b/share/qbs/modules/cpp/windows-msvc-base.qbs @@ -129,9 +129,7 @@ CppModule { auxiliaryInputs: ["hpp"] outputFileTags: Cpp.precompiledHeaderOutputTags("c", true) outputArtifacts: Cpp.precompiledHeaderOutputArtifacts(input, product, "c", true) - prepare: { - return MSVC.prepareCompiler.apply(MSVC, arguments); - } + prepare: MSVC.prepareCompiler.apply(MSVC, arguments) } Rule { @@ -141,9 +139,7 @@ CppModule { auxiliaryInputs: ["hpp"] outputFileTags: Cpp.precompiledHeaderOutputTags("cpp", true) outputArtifacts: Cpp.precompiledHeaderOutputArtifacts(input, product, "cpp", true) - prepare: { - return MSVC.prepareCompiler.apply(MSVC, arguments); - } + prepare: MSVC.prepareCompiler.apply(MSVC, arguments) } Rule { @@ -178,9 +174,7 @@ CppModule { return artifacts; } - prepare: { - return MSVC.prepareCompiler.apply(MSVC, arguments); - } + prepare: MSVC.prepareCompiler.apply(MSVC, arguments) } FileTagger { @@ -234,9 +228,7 @@ CppModule { return artifacts; } - prepare: { - return MSVC.prepareLinker.apply(MSVC, arguments); - } + prepare: MSVC.prepareLinker.apply(MSVC, arguments) } Rule { @@ -277,9 +269,7 @@ CppModule { return artifacts; } - prepare: { - return MSVC.prepareLinker.apply(MSVC, arguments); - } + prepare: MSVC.prepareLinker.apply(MSVC, arguments) } Rule { |