aboutsummaryrefslogtreecommitdiffstats
path: root/share/qbs/modules/cpp
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2014-04-07 15:54:32 -0400
committerJake Petroules <jake.petroules@petroules.com>2014-04-14 17:53:57 +0200
commit02071f4b56456370fc0a33439a781dff8d047576 (patch)
tree83587cd1bf7fca28a240b28f906a919c9b1c3359 /share/qbs/modules/cpp
parent51a1d99445aa07cc6b63d78701585a9389e62a87 (diff)
Use proper and consistent formatting in all JavaScript files.
Change-Id: I730e39070e2e93fea54e6a4fc52738c05f009e0e Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'share/qbs/modules/cpp')
-rw-r--r--share/qbs/modules/cpp/gcc.js18
-rw-r--r--share/qbs/modules/cpp/msvc.js14
2 files changed, 11 insertions, 21 deletions
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index 279f9b4a8..8f34c80c0 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -1,8 +1,7 @@
var PathTools = loadExtension("qbs.PathTools");
var WindowsUtils = loadExtension("qbs.WindowsUtils");
-function linkerFlags(product, inputs)
-{
+function linkerFlags(product, inputs) {
var libraryPaths = ModUtils.moduleProperties(product, 'libraryPaths');
var dynamicLibraries = ModUtils.moduleProperties(product, "dynamicLibraries");
var staticLibraries = ModUtils.modulePropertiesFromArtifacts(product, inputs.staticlibrary, 'cpp', 'staticLibraries');
@@ -131,8 +130,7 @@ function configFlags(config) {
// ### what we actually need here is something like product.usedFileTags
// that contains all fileTags that have been used when applying the rules.
-function additionalCompilerFlags(product, input, output)
-{
+function additionalCompilerFlags(product, input, output) {
var includePaths = ModUtils.moduleProperties(input, 'includePaths');
var frameworkPaths = ModUtils.moduleProperties(product, 'frameworkPaths');
var systemIncludePaths = ModUtils.moduleProperties(input, 'systemIncludePaths');
@@ -229,8 +227,7 @@ function additionalCompilerAndLinkerFlags(product) {
}
// Returns the GCC language name equivalent to fileTag, accepted by the -x argument
-function languageName(fileTag)
-{
+function languageName(fileTag) {
if (fileTag === 'c')
return 'c';
else if (fileTag === 'cpp')
@@ -245,8 +242,7 @@ function languageName(fileTag)
return 'assembler-with-cpp';
}
-function prepareCompiler(project, product, inputs, outputs, input, output)
-{
+function prepareCompiler(project, product, inputs, outputs, input, output) {
var i, c;
// Determine which C-language we're compiling
@@ -313,13 +309,11 @@ function prepareCompiler(project, product, inputs, outputs, input, output)
}
// Concatenates two arrays of library names and preserves the dependency order that ld needs.
-function concatLibs(libs, deplibs)
-{
+function concatLibs(libs, deplibs) {
var r = [];
var s = {};
- function addLibs(lst)
- {
+ function addLibs(lst) {
for (var i = lst.length; --i >= 0;) {
var lib = lst[i];
if (!s[lib]) {
diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js
index 9208540e0..1b7be75c5 100644
--- a/share/qbs/modules/cpp/msvc.js
+++ b/share/qbs/modules/cpp/msvc.js
@@ -1,5 +1,4 @@
-function prepareCompiler(product, input, outputs, platformDefines, defines, includePaths, systemIncludePaths, cFlags, cxxFlags)
-{
+function prepareCompiler(product, input, outputs, platformDefines, defines, includePaths, systemIncludePaths, cFlags, cxxFlags) {
var i;
var optimization = ModUtils.moduleProperty(input, "optimization")
var debugInformation = ModUtils.moduleProperty(input, "debugInformation")
@@ -117,8 +116,7 @@ function prepareCompiler(product, input, outputs, platformDefines, defines, incl
return cmd;
}
-function prepareLinker(product, inputs, outputs, libraryPaths, dynamicLibraries, staticLibraries, linkerFlags)
-{
+function prepareLinker(product, inputs, outputs, libraryPaths, dynamicLibraries, staticLibraries, linkerFlags) {
var i;
var linkDLL = (outputs.dynamiclibrary ? true : false)
var primaryOutput = (linkDLL ? outputs.dynamiclibrary[0] : outputs.application[0])
@@ -204,11 +202,9 @@ function prepareLinker(product, inputs, outputs, libraryPaths, dynamicLibraries,
cmd.highlight = 'linker';
cmd.workingDirectory = FileInfo.path(primaryOutput.filePath)
cmd.responseFileUsagePrefix = '@';
- cmd.stdoutFilterFunction =
- function(output)
- {
- return output.replace(/^ +Creating library.*\r\n$/, "");
- };
+ cmd.stdoutFilterFunction = function(output) {
+ return output.replace(/^ +Creating library.*\r\n$/, "");
+ };
commands.push(cmd);
if (generateManifestFiles) {