Rename ModUtils::findFirst() and ModUtils::appendAll().

The new names are "moduleProperty" and "moduleProperties", respectively.
These express much better what the functions do and also match their C++
counterparts.

Change-Id: I7f97f4b861f3ae58813377da593bc3b82be78bd3
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

10 files changed, 125 insertions, 125 deletions

diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index 81fb28ec4..80ea04833 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -36,15 +36,15 @@ CppModule {
 
         Artifact {
             fileName: product.destinationDirectory + "/"
-                      + ModUtils.findFirst(product, "dynamicLibraryPrefix") + product.targetName
-                      + ModUtils.findFirst(product, "dynamicLibrarySuffix")
+                      + ModUtils.moduleProperty(product, "dynamicLibraryPrefix") + product.targetName
+                      + ModUtils.moduleProperty(product, "dynamicLibrarySuffix")
             fileTags: ["dynamiclibrary"]
             cpp.transitiveSOs: {
                 var result = []
                 for (var i in inputs.dynamiclibrary) {
                     var lib = inputs.dynamiclibrary[i]
                     result.push(lib.fileName)
-                    var impliedLibs = ModUtils.appendAll(lib, 'transitiveSOs')
+                    var impliedLibs = ModUtils.moduleProperties(lib, 'transitiveSOs')
                     result = result.concat(impliedLibs)
                 }
                 return result
@@ -52,13 +52,13 @@ CppModule {
         }
 
         prepare: {
-            var libraryPaths = ModUtils.appendAll(product, 'libraryPaths');
-            var dynamicLibraries = ModUtils.appendAll(product, 'dynamicLibraries');
-            var staticLibraries = ModUtils.appendAll(product, 'staticLibraries');
-            var frameworkPaths = ModUtils.appendAll(product, 'frameworkPaths');
-            var frameworks = ModUtils.appendAllFromArtifacts(product, inputs.dynamiclibrary, 'cpp', 'frameworks');
-            var rpaths = ModUtils.appendAll(product, 'rpaths');
-            var linkerFlags = ModUtils.appendAll(product, 'linkerFlags');
+            var libraryPaths = ModUtils.moduleProperties(product, 'libraryPaths');
+            var dynamicLibraries = ModUtils.moduleProperties(product, 'dynamicLibraries');
+            var staticLibraries = ModUtils.moduleProperties(product, 'staticLibraries');
+            var frameworkPaths = ModUtils.moduleProperties(product, 'frameworkPaths');
+            var frameworks = ModUtils.modulePropertiesFromArtifacts(product, inputs.dynamiclibrary, 'cpp', 'frameworks');
+            var rpaths = ModUtils.moduleProperties(product, 'rpaths');
+            var linkerFlags = ModUtils.moduleProperties(product, 'linkerFlags');
             var i;
             var args = Gcc.configFlags(product);
             args.push('-shared');
@@ -74,7 +74,7 @@ CppModule {
                 args.push(linkerFlags[i])
             for (i in inputs.obj)
                 args.push(inputs.obj[i].fileName);
-            var sysroot = ModUtils.findFirst(product, "sysroot")
+            var sysroot = ModUtils.moduleProperty(product, "sysroot")
             if (sysroot)
                 args.push('--sysroot=' + sysroot)
             var staticLibrariesI = [];
@@ -88,8 +88,8 @@ CppModule {
                 fileName = inputs.framework[i].fileName;
                 frameworkPaths.push(FileInfo.path(fileName));
                 fileName = Gcc.removePrefixAndSuffix(FileInfo.fileName(fileName),
-                                                     ModUtils.findFirst(product, "dynamicLibraryPrefix"),
-                                                     ModUtils.findFirst(product, "dynamicLibrarySuffix"));
+                                                     ModUtils.moduleProperty(product, "dynamicLibraryPrefix"),
+                                                     ModUtils.moduleProperty(product, "dynamicLibrarySuffix"));
                 frameworksI.push(fileName);
             }
 
@@ -98,7 +98,7 @@ CppModule {
             args = args.concat(Gcc.libs(libraryPaths, frameworkPaths, rpaths, dynamicLibraries, staticLibrariesI, frameworksI));
             for (i in inputs.dynamiclibrary)
                 args.push(inputs.dynamiclibrary[i].fileName);
-            var cmd = new Command(ModUtils.findFirst(product, "compilerPath"), args);
+            var cmd = new Command(ModUtils.moduleProperty(product, "compilerPath"), args);
             cmd.description = 'linking ' + FileInfo.fileName(output.fileName);
             cmd.highlight = 'linker';
             return cmd;
@@ -112,15 +112,15 @@ CppModule {
         usings: ['dynamiclibrary', 'staticlibrary']
 
         Artifact {
-            fileName: product.destinationDirectory + "/" + ModUtils.findFirst(product, "staticLibraryPrefix")
-                      + product.targetName + ModUtils.findFirst(product, "staticLibrarySuffix")
+            fileName: product.destinationDirectory + "/" + ModUtils.moduleProperty(product, "staticLibraryPrefix")
+                      + product.targetName + ModUtils.moduleProperty(product, "staticLibrarySuffix")
             fileTags: ["staticlibrary"]
             cpp.staticLibraries: {
                 var result = []
                 for (var i in inputs.staticlibrary) {
                     var lib = inputs.staticlibrary[i]
                     result.push(lib.fileName)
-                    var impliedLibs = ModUtils.appendAll(lib, 'staticLibraries')
+                    var impliedLibs = ModUtils.moduleProperties(lib, 'staticLibraries')
                     result.concat(impliedLibs)
                 }
                 return result
@@ -130,7 +130,7 @@ CppModule {
                 for (var i in inputs.dynamiclibrary) {
                     var lib = inputs.dynamiclibrary[i]
                     result.push(lib.fileName)
-                    var impliedLibs = ModUtils.appendAll(lib, 'dynamicLibraries')
+                    var impliedLibs = ModUtils.moduleProperties(lib, 'dynamicLibraries')
                     result.concat(impliedLibs)
                 }
                 return result
@@ -141,7 +141,7 @@ CppModule {
             var args = ['rcs', output.fileName];
             for (var i in inputs.obj)
                 args.push(inputs.obj[i].fileName);
-            var cmd = new Command(ModUtils.findFirst(product, "archiverPath"), args);
+            var cmd = new Command(ModUtils.moduleProperty(product, "archiverPath"), args);
             cmd.description = 'creating ' + FileInfo.fileName(output.fileName);
             cmd.highlight = 'linker'
             return cmd;
@@ -155,23 +155,23 @@ CppModule {
         usings: ['dynamiclibrary', 'staticlibrary']
 
         Artifact {
-            fileName: product.destinationDirectory + "/" + ModUtils.findFirst(product, "executablePrefix")
-                      + product.targetName + ModUtils.findFirst(product, "executableSuffix")
+            fileName: product.destinationDirectory + "/" + ModUtils.moduleProperty(product, "executablePrefix")
+                      + product.targetName + ModUtils.moduleProperty(product, "executableSuffix")
             fileTags: ["application"]
         }
 
         prepare: {
-            var libraryPaths = ModUtils.appendAll(product, 'libraryPaths');
-            var dynamicLibraries = ModUtils.appendAllFromArtifacts(product, inputs.dynamiclibrary, 'cpp', 'dynamicLibraries');
-            var staticLibraries = ModUtils.appendAllFromArtifacts(product, inputs.staticlibrary, 'cpp', 'staticLibraries');
-            var frameworkPaths = ModUtils.appendAll(product, 'frameworkPaths');
-            var frameworks = ModUtils.appendAllFromArtifacts(product, inputs.dynamiclibrary, 'cpp', 'frameworks');
-            var rpaths = ModUtils.appendAll(product, 'rpaths');
-            var linkerFlags = ModUtils.appendAll(product, 'linkerFlags');
+            var libraryPaths = ModUtils.moduleProperties(product, 'libraryPaths');
+            var dynamicLibraries = ModUtils.modulePropertiesFromArtifacts(product, inputs.dynamiclibrary, 'cpp', 'dynamicLibraries');
+            var staticLibraries = ModUtils.modulePropertiesFromArtifacts(product, inputs.staticlibrary, 'cpp', 'staticLibraries');
+            var frameworkPaths = ModUtils.moduleProperties(product, 'frameworkPaths');
+            var frameworks = ModUtils.modulePropertiesFromArtifacts(product, inputs.dynamiclibrary, 'cpp', 'frameworks');
+            var rpaths = ModUtils.moduleProperties(product, 'rpaths');
+            var linkerFlags = ModUtils.moduleProperties(product, 'linkerFlags');
             var args = Gcc.configFlags(product);
             for (var i in inputs.obj)
                 args.push(inputs.obj[i].fileName)
-            var sysroot = ModUtils.findFirst(product, "sysroot")
+            var sysroot = ModUtils.moduleProperty(product, "sysroot")
             if (sysroot)
                 args.push('--sysroot=' + sysroot)
             for (i in linkerFlags)
@@ -193,8 +193,8 @@ CppModule {
             staticLibrariesI = staticLibrariesI.concat(staticLibraries);
 
             var dynamicLibrariesI = [];
-            var dllPrefix = ModUtils.findFirst(product, "dynamicLibraryPrefix")
-            var dllSuffix = ModUtils.findFirst(product, "dynamicLibrarySuffix")
+            var dllPrefix = ModUtils.moduleProperty(product, "dynamicLibraryPrefix")
+            var dllSuffix = ModUtils.moduleProperty(product, "dynamicLibrarySuffix")
             for (i in dynamicLibraries) {
                 if (dynamicLibraries[i].match("^" + dllPrefix + ".*\\" + dllSuffix + "$") !== null) {
                     // shared object filename found
@@ -210,7 +210,7 @@ CppModule {
             }
 
             if (product.moduleProperty("qbs", "targetOS") === 'linux') {
-                var transitiveSOs = ModUtils.appendAllFromArtifacts(product, inputs.dynamiclibrary, 'cpp', 'transitiveSOs')
+                var transitiveSOs = ModUtils.modulePropertiesFromArtifacts(product, inputs.dynamiclibrary, 'cpp', 'transitiveSOs')
                 for (i in transitiveSOs) {
                     args.push("-Wl,-rpath-link=" + FileInfo.path(transitiveSOs[i]))
                 }
@@ -227,7 +227,7 @@ CppModule {
             args = args.concat(Gcc.libs(libraryPaths, frameworkPaths, rpaths, dynamicLibrariesI, staticLibrariesI, frameworksI));
             for (i in inputs.dynamiclibrary)
                 args.push(inputs.dynamiclibrary[i].fileName);
-            var cmd = new Command(ModUtils.findFirst(product, "compilerPath"), args);
+            var cmd = new Command(ModUtils.moduleProperty(product, "compilerPath"), args);
             cmd.description = 'linking ' + FileInfo.fileName(output.fileName);
             cmd.highlight = 'linker'
             return cmd;
@@ -246,13 +246,13 @@ CppModule {
         }
 
         prepare: {
-            var includePaths = ModUtils.appendAll(input, 'includePaths');
-            var frameworkPaths = ModUtils.appendAll(product, 'frameworkPaths');
-            var systemIncludePaths = ModUtils.appendAll(input, 'systemIncludePaths');
-            var cFlags = ModUtils.appendAll(input, 'cFlags');
-            var cxxFlags = ModUtils.appendAll(input, 'cxxFlags');
-            var objcFlags = ModUtils.appendAll(input, 'objcFlags');
-            var visibility = ModUtils.findFirst(product, 'visibility');
+            var includePaths = ModUtils.moduleProperties(input, 'includePaths');
+            var frameworkPaths = ModUtils.moduleProperties(product, 'frameworkPaths');
+            var systemIncludePaths = ModUtils.moduleProperties(input, 'systemIncludePaths');
+            var cFlags = ModUtils.moduleProperties(input, 'cFlags');
+            var cxxFlags = ModUtils.moduleProperties(input, 'cxxFlags');
+            var objcFlags = ModUtils.moduleProperties(input, 'objcFlags');
+            var visibility = ModUtils.moduleProperty(product, 'visibility');
             var args = Gcc.configFlags(input);
             var isCxx = true;
             var isObjC = false;
@@ -269,10 +269,10 @@ CppModule {
                     args.push('-fvisibility=default')
             }
 
-            if (ModUtils.findFirst(product, "precompiledHeader")) {
+            if (ModUtils.moduleProperty(product, "precompiledHeader")) {
                 args.push('-include')
                 args.push(product.name)
-                var pchPath = ModUtils.findFirst(product, "precompiledHeaderDir")
+                var pchPath = ModUtils.moduleProperty(product, "precompiledHeaderDir")
                 var pchPathIncluded = false
                 for (var i in includePaths) {
                     if (includePaths[i] == pchPath) {
@@ -310,7 +310,7 @@ CppModule {
                     args = args.concat(cFlags);
             }
             args = args.concat(Gcc.additionalFlags(product, includePaths, frameworkPaths, systemIncludePaths, input.fileName, output))
-            var cmd = new Command(ModUtils.findFirst(product, "compilerPath"), args);
+            var cmd = new Command(ModUtils.moduleProperty(product, "compilerPath"), args);
             cmd.description = 'compiling ' + FileInfo.fileName(input.fileName);
             cmd.highlight = "compiler";
             return cmd;
@@ -326,17 +326,17 @@ CppModule {
         }
         prepare: {
             var args = Gcc.configFlags(product);
-            var includePaths = ModUtils.appendAll(input, 'includePaths');
-            var frameworkPaths = ModUtils.appendAll(product, 'frameworkPaths');
-            var systemIncludePaths = ModUtils.appendAll(input, 'systemIncludePaths');
+            var includePaths = ModUtils.moduleProperties(input, 'includePaths');
+            var frameworkPaths = ModUtils.moduleProperties(product, 'frameworkPaths');
+            var systemIncludePaths = ModUtils.moduleProperties(input, 'systemIncludePaths');
             args.push('-x');
             args.push('c++-header');
-            var cxxFlags = ModUtils.findFirst(product, "cxxFlags")
+            var cxxFlags = ModUtils.moduleProperty(product, "cxxFlags")
             if (cxxFlags)
                 args = args.concat(cxxFlags);
             args = args.concat(Gcc.additionalFlags(product, includePaths, frameworkPaths, systemIncludePaths,
-                    ModUtils.findFirst(product, "precompiledHeader"), output));
-            var cmd = new Command(ModUtils.findFirst(product, "compilerPath"), args);
+                    ModUtils.moduleProperty(product, "precompiledHeader"), output));
+            var cmd = new Command(ModUtils.moduleProperty(product, "compilerPath"), args);
             cmd.description = 'precompiling ' + FileInfo.fileName(input.fileName);
             return cmd;
         }
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index d33f93ac3..c9f2b9d16 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -31,28 +31,28 @@ function libs(libraryPaths, frameworkPaths, rpaths, dynamicLibraries, staticLibr
 function configFlags(config) {
     var args = [];
 
-    var arch = ModUtils.findFirst(config, "architecture")
+    var arch = ModUtils.moduleProperty(config, "architecture")
     if (arch === 'x86_64')
         args.push('-m64');
     else if (arch === 'x86')
         args.push('-m32');
 
-    if (ModUtils.findFirst/config, "debugInformation")
+    if (ModUtils.moduleProperty/config, "debugInformation")
         args.push('-g');
-    var opt = ModUtils.findFirst(config, "optimization")
+    var opt = ModUtils.moduleProperty(config, "optimization")
     if (opt === 'fast')
         args.push('-O2');
     if (opt === 'small')
         args.push('-Os');
 
-    var warnings = ModUtils.findFirst(config, "warningLevel")
+    var warnings = ModUtils.moduleProperty(config, "warningLevel")
     if (warnings === 'none')
         args.push('-w');
     if (warnings === 'all') {
         args.push('-Wall');
         args.push('-Wextra');
     }
-    if (ModUtils.findFirst(config, "treatWarningsAsErrors"))
+    if (ModUtils.moduleProperty(config, "treatWarningsAsErrors"))
         args.push('-Werror');
 
     return args;
@@ -78,17 +78,17 @@ function additionalFlags(product, includePaths, frameworkPaths, systemIncludePat
     } else {
         throw ("The product's type must be in {staticlibrary, dynamiclibrary, application}. But it is " + product.type + '.');
     }
-    var sysroot = ModUtils.findFirst(product, "sysroot")
+    var sysroot = ModUtils.moduleProperty(product, "sysroot")
     if (sysroot)
         args.push('--sysroot=' + sysroot)
     var i;
-    var cppFlags = ModUtils.appendAll(input, 'cppFlags');
+    var cppFlags = ModUtils.moduleProperties(input, 'cppFlags');
     for (i in cppFlags)
         args.push('-Wp,' + cppFlags[i])
-    var platformDefines = ModUtils.appendAll(input, 'platformDefines');
+    var platformDefines = ModUtils.moduleProperties(input, 'platformDefines');
     for (i in platformDefines)
         args.push('-D' + platformDefines[i]);
-    var defines = ModUtils.appendAll(input, 'defines');
+    var defines = ModUtils.moduleProperties(input, 'defines');
     for (i in defines)
         args.push('-D' + defines[i]);
     for (i in includePaths)
diff --git a/share/qbs/modules/cpp/mac-gcc.qbs b/share/qbs/modules/cpp/mac-gcc.qbs
index 26a6262e3..61425724e 100644
--- a/share/qbs/modules/cpp/mac-gcc.qbs
+++ b/share/qbs/modules/cpp/mac-gcc.qbs
@@ -22,7 +22,7 @@ UnixGCC {
             var cmd = new JavaScriptCommand();
             cmd.description = "generating Info.plist";
             cmd.highlight = "codegen";
-            cmd.infoPlist = ModUtils.findFirst(product, "infoPlist") || {};
+            cmd.infoPlist = ModUtils.moduleProperty(product, "infoPlist") || {};
             cmd.sourceCode = function() {
                 var infoplist = new TextFile(outputs.infoplist[0].fileName, TextFile.WriteOnly);
                 infoplist.writeLine('<?xml version="1.0" encoding="UTF-8"?>');
@@ -78,7 +78,7 @@ UnixGCC {
             var cmd = new JavaScriptCommand();
             cmd.description = "generating PkgInfo";
             cmd.highlight = "codegen";
-            cmd.pkgInfo = ModUtils.findFirst(product, "pkgInfo") || "FOO";
+            cmd.pkgInfo = ModUtils.moduleProperty(product, "pkgInfo") || "FOO";
             cmd.sourceCode = function() {
                 var pkginfo = new TextFile(outputs.pkginfo[0].fileName, TextFile.WriteOnly);
                 pkginfo.write(pkgInfo);
diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js
index 25fa7f4cf..a51938ed5 100644
--- a/share/qbs/modules/cpp/msvc.js
+++ b/share/qbs/modules/cpp/msvc.js
@@ -1,8 +1,8 @@
 function prepareCompiler(product, input, outputs, platformDefines, defines, includePaths, systemIncludePaths, cFlags, cxxFlags)
 {
     var i;
-    var optimization = ModUtils.findFirst(input, "optimization")
-    var debugInformation = ModUtils.findFirst(input, "debugInformation")
+    var optimization = ModUtils.moduleProperty(input, "optimization")
+    var debugInformation = ModUtils.moduleProperty(input, "debugInformation")
     var args = ['/nologo', '/c']
 
     // C or C++
@@ -26,12 +26,12 @@ function prepareCompiler(product, input, outputs, platformDefines, defines, incl
         args.push('/MD')
     }
     // warnings:
-    var warningLevel = ModUtils.findFirst(input, "warningLevel")
+    var warningLevel = ModUtils.moduleProperty(input, "warningLevel")
     if (warningLevel === 'none')
         args.push('/w')
     if (warningLevel === 'all')
         args.push('/Wall')
-    if (ModUtils.findFirst(input, "treatWarningsAsErrors"))
+    if (ModUtils.moduleProperty(input, "treatWarningsAsErrors"))
         args.push('/WX')
     for (i in includePaths)
         args.push('/I' + FileInfo.toWindowsSeparators(includePaths[i]))
@@ -46,7 +46,7 @@ function prepareCompiler(product, input, outputs, platformDefines, defines, incl
     var pchOutput = outputs["c++_pch"] ? outputs["c++_pch"][0] : undefined
 
     // precompiled header file
-    var pch = ModUtils.findFirst(product, "precompiledHeader")
+    var pch = ModUtils.moduleProperty(product, "precompiledHeader")
     if (pch) {
         if (pchOutput) {
             // create pch
@@ -58,7 +58,7 @@ function prepareCompiler(product, input, outputs, platformDefines, defines, incl
         } else {
             // use pch
             var pchHeaderName = FileInfo.toWindowsSeparators(pch)
-            var pchName = FileInfo.toWindowsSeparators(ModUtils.findFirst(product, "precompiledHeaderDir")
+            var pchName = FileInfo.toWindowsSeparators(ModUtils.moduleProperty(product, "precompiledHeaderDir")
                     + "\\.obj\\" + product.name + "\\" + product.name + ".pch")
             args.push("/FI" + pchHeaderName)
             args.push("/Yu" + pchHeaderName)
@@ -80,7 +80,7 @@ function prepareCompiler(product, input, outputs, platformDefines, defines, incl
     cmd.description = (pchOutput ? 'pre' : '') + 'compiling ' + FileInfo.fileName(input.fileName)
     cmd.highlight = "compiler";
     cmd.workingDirectory = FileInfo.path(objOutput.fileName)
-    cmd.responseFileThreshold = ModUtils.findFirst(product, "responseFileThreshold")
+    cmd.responseFileThreshold = ModUtils.moduleProperty(product, "responseFileThreshold")
     cmd.responseFileUsagePrefix = '@';
     // cl.exe outputs the cpp file name. We filter that out.
     cmd.stdoutFilterFunction = "function(output) {";
@@ -94,8 +94,8 @@ function prepareLinker(product, inputs, outputs, libraryPaths, dynamicLibraries,
     var i;
     var linkDLL = (outputs.dynamiclibrary ? true : false)
     var primaryOutput = (linkDLL ? outputs.dynamiclibrary[0] : outputs.application[0])
-    var debugInformation = ModUtils.findFirst(product, "debugInformation")
-    var generateManifestFiles = !linkDLL && ModUtils.findFirst(product, "generateManifestFiles")
+    var debugInformation = ModUtils.moduleProperty(product, "debugInformation")
+    var generateManifestFiles = !linkDLL && ModUtils.moduleProperty(product, "generateManifestFiles")
 
     var args = ['/nologo']
     if (linkDLL) {
@@ -158,7 +158,7 @@ function prepareLinker(product, inputs, outputs, libraryPaths, dynamicLibraries,
     cmd.description = 'linking ' + FileInfo.fileName(primaryOutput.fileName)
     cmd.highlight = 'linker';
     cmd.workingDirectory = FileInfo.path(primaryOutput.fileName)
-    cmd.responseFileThreshold = ModUtils.findFirst(product, "responseFileThreshold")
+    cmd.responseFileThreshold = ModUtils.moduleProperty(product, "responseFileThreshold")
     cmd.responseFileUsagePrefix = '@';
     cmd.stdoutFilterFunction =
             function(output)
diff --git a/share/qbs/modules/cpp/windows-mingw.qbs b/share/qbs/modules/cpp/windows-mingw.qbs
index 6eb5572a3..48a624c9a 100644
--- a/share/qbs/modules/cpp/windows-mingw.qbs
+++ b/share/qbs/modules/cpp/windows-mingw.qbs
@@ -36,10 +36,10 @@ GenericGCC {
         }
 
         prepare: {
-            var platformDefines = ModUtils.appendAll(input, 'platformDefines');
-            var defines = ModUtils.appendAll(input, 'defines');
-            var includePaths = ModUtils.appendAll(input, 'includePaths');
-            var systemIncludePaths = ModUtils.appendAll(input, 'systemIncludePaths');
+            var platformDefines = ModUtils.moduleProperties(input, 'platformDefines');
+            var defines = ModUtils.moduleProperties(input, 'defines');
+            var includePaths = ModUtils.moduleProperties(input, 'includePaths');
+            var systemIncludePaths = ModUtils.moduleProperties(input, 'systemIncludePaths');
             var args = [];
             var i;
             for (i in platformDefines) {
@@ -60,7 +60,7 @@ GenericGCC {
             }
 
             args = args.concat(['-i', input.fileName, '-o', output.fileName]);
-            var cmd = new Command(ModUtils.findFirst(product, "windresPath"), args);
+            var cmd = new Command(ModUtils.moduleProperty(product, "windresPath"), args);
             cmd.description = 'compiling ' + FileInfo.fileName(input.fileName);
             cmd.highlight = 'compiler';
             return cmd;
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs
index 6f91559db..0a3b81dfb 100644
--- a/share/qbs/modules/cpp/windows-msvc.qbs
+++ b/share/qbs/modules/cpp/windows-msvc.qbs
@@ -79,12 +79,12 @@ CppModule {
             fileName: ".obj/" + product.name + "/" + product.name + '.pch'
         }
         prepare: {
-            var platformDefines = ModUtils.appendAll(input, 'platformDefines');
-            var defines = ModUtils.appendAll(input, 'defines');
-            var includePaths = ModUtils.appendAll(input, 'includePaths');
-            var systemIncludePaths = ModUtils.appendAll(input, 'systemIncludePaths');
-            var cFlags = ModUtils.appendAll(input, 'cFlags');
-            var cxxFlags = ModUtils.appendAll(input, 'cxxFlags');
+            var platformDefines = ModUtils.moduleProperties(input, 'platformDefines');
+            var defines = ModUtils.moduleProperties(input, 'defines');
+            var includePaths = ModUtils.moduleProperties(input, 'includePaths');
+            var systemIncludePaths = ModUtils.moduleProperties(input, 'systemIncludePaths');
+            var cFlags = ModUtils.moduleProperties(input, 'cFlags');
+            var cxxFlags = ModUtils.moduleProperties(input, 'cxxFlags');
             return MSVC.prepareCompiler(product, input, outputs, platformDefines, defines, includePaths, systemIncludePaths, cFlags, cxxFlags)
         }
     }
@@ -100,12 +100,12 @@ CppModule {
         }
  
         prepare: {
-            var platformDefines = ModUtils.appendAll(input, 'platformDefines');
-            var defines = ModUtils.appendAll(input, 'defines');
-            var includePaths = ModUtils.appendAll(input, 'includePaths');
-            var systemIncludePaths = ModUtils.appendAll(input, 'systemIncludePaths');
-            var cFlags = ModUtils.appendAll(input, 'cFlags');
-            var cxxFlags = ModUtils.appendAll(input, 'cxxFlags');
+            var platformDefines = ModUtils.moduleProperties(input, 'platformDefines');
+            var defines = ModUtils.moduleProperties(input, 'defines');
+            var includePaths = ModUtils.moduleProperties(input, 'includePaths');
+            var systemIncludePaths = ModUtils.moduleProperties(input, 'systemIncludePaths');
+            var cFlags = ModUtils.moduleProperties(input, 'cFlags');
+            var cxxFlags = ModUtils.moduleProperties(input, 'cxxFlags');
             return MSVC.prepareCompiler(product, input, outputs, platformDefines, defines, includePaths, systemIncludePaths, cFlags, cxxFlags)
         }
     }
@@ -117,15 +117,15 @@ CppModule {
         usings: ['staticlibrary', 'dynamiclibrary_import']
         Artifact {
             fileTags: ["application"]
-            fileName: product.destinationDirectory + "/" + ModUtils.findFirst(product, "executablePrefix")
-                      + product.targetName + ModUtils.findFirst(product, "executableSuffix")
+            fileName: product.destinationDirectory + "/" + ModUtils.moduleProperty(product, "executablePrefix")
+                      + product.targetName + ModUtils.moduleProperty(product, "executableSuffix")
         }
 
         prepare: {
-            var libraryPaths = ModUtils.appendAll(product, 'libraryPaths');
-            var dynamicLibraries = ModUtils.appendAllFromArtifacts(product, inputs.dynamiclibrary_import, 'cpp', 'dynamicLibraries');
-            var staticLibraries = ModUtils.appendAllFromArtifacts(product, (inputs.staticlibrary || []).concat(inputs.obj), 'cpp', 'staticLibraries');
-            var linkerFlags = ModUtils.appendAll(product, 'linkerFlags');
+            var libraryPaths = ModUtils.moduleProperties(product, 'libraryPaths');
+            var dynamicLibraries = ModUtils.modulePropertiesFromArtifacts(product, inputs.dynamiclibrary_import, 'cpp', 'dynamicLibraries');
+            var staticLibraries = ModUtils.modulePropertiesFromArtifacts(product, (inputs.staticlibrary || []).concat(inputs.obj), 'cpp', 'staticLibraries');
+            var linkerFlags = ModUtils.moduleProperties(product, 'linkerFlags');
             return MSVC.prepareLinker(product, inputs, outputs, libraryPaths, dynamicLibraries, staticLibraries, linkerFlags)
         }
     }
@@ -139,23 +139,23 @@ CppModule {
         Artifact {
             fileTags: ["dynamiclibrary"]
             fileName: product.destinationDirectory + "/"
-                      + ModUtils.findFirst(product, "dynamicLibraryPrefix") + product.targetName
-                      + ModUtils.findFirst(product, "dynamicLibrarySuffix")
+                      + ModUtils.moduleProperty(product, "dynamicLibraryPrefix") + product.targetName
+                      + ModUtils.moduleProperty(product, "dynamicLibrarySuffix")
         }
 
         Artifact {
             fileTags: ["dynamiclibrary_import"]
             fileName: product.destinationDirectory + "/"
-                      + ModUtils.findFirst(product, "dynamicLibraryPrefix") + product.targetName
-                      + ModUtils.findFirst(product, "dynamicLibraryImportSuffix")
+                      + ModUtils.moduleProperty(product, "dynamicLibraryPrefix") + product.targetName
+                      + ModUtils.moduleProperty(product, "dynamicLibraryImportSuffix")
             alwaysUpdated: false
         }
 
         prepare: {
-            var libraryPaths = ModUtils.appendAll(product, 'libraryPaths');
-            var dynamicLibraries = ModUtils.appendAll(product, 'dynamicLibraries');
-            var staticLibraries = ModUtils.appendAllFromArtifacts(product, (inputs.staticlibrary || []).concat(inputs.obj), 'cpp', 'staticLibraries');
-            var linkerFlags = ModUtils.appendAll(product, 'linkerFlags');
+            var libraryPaths = ModUtils.moduleProperties(product, 'libraryPaths');
+            var dynamicLibraries = ModUtils.moduleProperties(product, 'dynamicLibraries');
+            var staticLibraries = ModUtils.modulePropertiesFromArtifacts(product, (inputs.staticlibrary || []).concat(inputs.obj), 'cpp', 'staticLibraries');
+            var linkerFlags = ModUtils.moduleProperties(product, 'linkerFlags');
             return MSVC.prepareLinker(product, inputs, outputs, libraryPaths, dynamicLibraries, staticLibraries, linkerFlags)
         }
     }
@@ -168,14 +168,14 @@ CppModule {
 
         Artifact {
             fileTags: ["staticlibrary"]
-            fileName: product.destinationDirectory + "/" + ModUtils.findFirst(product, "staticLibraryPrefix")
-                      + product.targetName + ModUtils.findFirst(product, "staticLibrarySuffix")
+            fileName: product.destinationDirectory + "/" + ModUtils.moduleProperty(product, "staticLibraryPrefix")
+                      + product.targetName + ModUtils.moduleProperty(product, "staticLibrarySuffix")
             cpp.staticLibraries: {
                 var result = []
                 for (var i in inputs.staticlibrary) {
                     var lib = inputs.staticlibrary[i]
                     result.push(lib.fileName)
-                    var impliedLibs = ModUtils.appendAll(lib, 'staticLibraries')
+                    var impliedLibs = ModUtils.moduleProperties(lib, 'staticLibraries')
                     result.concat(impliedLibs)
                 }
                 return result
@@ -183,7 +183,7 @@ CppModule {
         }
 
         prepare: {
-            var toolchainInstallPath = ModUtils.findFirst(product, "toolchainInstallPath")
+            var toolchainInstallPath = ModUtils.moduleProperty(product, "toolchainInstallPath")
 
             var args = ['/nologo']
             var nativeOutputFileName = FileInfo.toWindowsSeparators(output.fileName)
@@ -192,7 +192,7 @@ CppModule {
                 var fileName = FileInfo.toWindowsSeparators(inputs.obj[i].fileName)
                 args.push(fileName)
             }
-            var is64bit = (ModUtils.findFirst(product, "architecture") == "x86_64")
+            var is64bit = (ModUtils.moduleProperty(product, "architecture") == "x86_64")
             var linkerPath = toolchainInstallPath + '/VC/bin/'
             if (is64bit)
                 linkerPath += 'amd64/'
@@ -201,7 +201,7 @@ CppModule {
             cmd.description = 'creating ' + FileInfo.fileName(output.fileName)
             cmd.highlight = 'linker';
             cmd.workingDirectory = FileInfo.path(output.fileName)
-            cmd.responseFileThreshold = ModUtils.findFirst(product, "responseFileThreshold")
+            cmd.responseFileThreshold = ModUtils.moduleProperty(product, "responseFileThreshold")
             cmd.responseFileUsagePrefix = '@';
             return cmd;
          }
@@ -221,10 +221,10 @@ CppModule {
         }
 
         prepare: {
-            var platformDefines = ModUtils.appendAll(input, 'platformDefines');
-            var defines = ModUtils.appendAll(input, 'defines');
-            var includePaths = ModUtils.appendAll(input, 'includePaths');
-            var systemIncludePaths = ModUtils.appendAll(input, 'systemIncludePaths');
+            var platformDefines = ModUtils.moduleProperties(input, 'platformDefines');
+            var defines = ModUtils.moduleProperties(input, 'defines');
+            var includePaths = ModUtils.moduleProperties(input, 'includePaths');
+            var systemIncludePaths = ModUtils.moduleProperties(input, 'systemIncludePaths');
             var args = [];
             var i;
             for (i in platformDefines) {
diff --git a/share/qbs/modules/qt/core/moc.js b/share/qbs/modules/qt/core/moc.js
index 43f174408..be3a8fd60 100644
--- a/share/qbs/modules/qt/core/moc.js
+++ b/share/qbs/modules/qt/core/moc.js
@@ -1,9 +1,9 @@
 function args(product, input, outputFileName)
 {
-    var defines = ModUtils.appendAllFromArtifacts(product, [input], 'cpp', 'compilerDefines');
-    defines = defines.concat(ModUtils.appendAllFromArtifacts(product, [input], 'cpp', 'platformDefines'));
-    defines = defines.concat(ModUtils.appendAllFromArtifacts(product, [input], 'cpp', 'defines'));
-    var includePaths = ModUtils.appendAllFromArtifacts(product, [input], 'cpp', 'includePaths');
+    var defines = ModUtils.modulePropertiesFromArtifacts(product, [input], 'cpp', 'compilerDefines');
+    defines = defines.concat(ModUtils.modulePropertiesFromArtifacts(product, [input], 'cpp', 'platformDefines'));
+    defines = defines.concat(ModUtils.modulePropertiesFromArtifacts(product, [input], 'cpp', 'defines'));
+    var includePaths = ModUtils.modulePropertiesFromArtifacts(product, [input], 'cpp', 'includePaths');
     var args = [];
     args = args.concat(
                 defines.map(function(item) { return '-D' + item; }),
@@ -15,5 +15,5 @@ function args(product, input, outputFileName)
 
 function fullPath(product)
 {
-    return ModUtils.findFirst(product, "binPath") + '/' + ModUtils.findFirst(product, "mocName");
+    return ModUtils.moduleProperty(product, "binPath") + '/' + ModUtils.moduleProperty(product, "mocName");
 }
diff --git a/share/qbs/modules/qt/core/qtcore.qbs b/share/qbs/modules/qt/core/qtcore.qbs
index 64db5793d..821b548a1 100644
--- a/share/qbs/modules/qt/core/qtcore.qbs
+++ b/share/qbs/modules/qt/core/qtcore.qbs
@@ -169,7 +169,7 @@ Module {
             fileTags: ["cpp"]
         }
         prepare: {
-            var cmd = new Command(ModUtils.findFirst(product, "binPath") + '/rcc',
+            var cmd = new Command(ModUtils.moduleProperty(product, "binPath") + '/rcc',
                                   [input.fileName, '-name',
                                    FileInfo.completeBaseName(input.fileName),
                                    '-o', output.fileName]);
@@ -183,14 +183,14 @@ Module {
         inputs: ["ts"]
 
         Artifact {
-            fileName: FileInfo.joinPaths(ModUtils.findFirst(product, "qmFilesDir"),
+            fileName: FileInfo.joinPaths(ModUtils.moduleProperty(product, "qmFilesDir"),
                                          input.completeBaseName + ".qm")
             fileTags: ["qm"]
         }
 
         prepare: {
-            var cmd = new Command(ModUtils.findFirst(product, "binPath") + '/'
-                                  + ModUtils.findFirst(product, "lreleaseName"),
+            var cmd = new Command(ModUtils.moduleProperty(product, "binPath") + '/'
+                                  + ModUtils.moduleProperty(product, "lreleaseName"),
                                   ['-silent', input.fileName, '-qm', output.fileName]);
             cmd.description = 'lrelease ' + FileInfo.fileName(input.fileName);
             cmd.highlight = 'filegen';
diff --git a/share/qbs/modules/qt/gui/qtgui.qbs b/share/qbs/modules/qt/gui/qtgui.qbs
index 8a2391a03..587adee65 100644
--- a/share/qbs/modules/qt/gui/qtgui.qbs
+++ b/share/qbs/modules/qt/gui/qtgui.qbs
@@ -23,8 +23,8 @@ QtModule {
         }
 
         prepare: {
-            var cmd = new Command(ModUtils.findFirst(product, "binPath") + '/'
-                                  + ModUtils.findFirst(product, "uicName"),
+            var cmd = new Command(ModUtils.moduleProperty(product, "binPath") + '/'
+                                  + ModUtils.moduleProperty(product, "uicName"),
                                   [input.fileName, '-o', output.fileName])
             cmd.description = 'uic ' + FileInfo.fileName(input.fileName);
             cmd.highlight = 'codegen';
diff --git a/share/qbs/modules/utils.js b/share/qbs/modules/utils.js
index 8d7b037df..afdfcceeb 100644
--- a/share/qbs/modules/utils.js
+++ b/share/qbs/modules/utils.js
@@ -2,12 +2,12 @@
 // utility functions for modules
 //
 
-function appendAll(config, key)
+function moduleProperties(config, key)
 {
     return config.moduleProperties(config.moduleName, key)
 }
 
-function appendAllFromArtifacts(product, artifacts, moduleName, propertyName)
+function modulePropertiesFromArtifacts(product, artifacts, moduleName, propertyName)
 {
     var seenValues = []
     var result = product.moduleProperties(moduleName, propertyName)
@@ -16,7 +16,7 @@ function appendAllFromArtifacts(product, artifacts, moduleName, propertyName)
     return result
 }
 
-function findFirst(product, propertyName)
+function moduleProperty(product, propertyName)
 {
     return product.moduleProperty(product.moduleName, propertyName)
 }