aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--share/qbs/imports/qbs/ModUtils/utils.js2
-rw-r--r--share/qbs/modules/java/utils.js9
-rw-r--r--tests/auto/blackbox/testdata/dynamic-project/dynamic-project.qbs2
3 files changed, 6 insertions, 7 deletions
diff --git a/share/qbs/imports/qbs/ModUtils/utils.js b/share/qbs/imports/qbs/ModUtils/utils.js
index 502fa1e45..507e68088 100644
--- a/share/qbs/imports/qbs/ModUtils/utils.js
+++ b/share/qbs/imports/qbs/ModUtils/utils.js
@@ -408,7 +408,7 @@ var PropertyValidator = (function () {
errorMessage += "The following properties have invalid values:\n";
lines = [];
for (i in invalidProperties) {
- for (j in invalidProperties[i]) {
+ for (j = 0; j < invalidProperties[i].length; ++j) {
lines.push(this.moduleName + "." + i + ": " + invalidProperties[i][j]);
}
}
diff --git a/share/qbs/modules/java/utils.js b/share/qbs/modules/java/utils.js
index 0e11b7d3e..520511192 100644
--- a/share/qbs/modules/java/utils.js
+++ b/share/qbs/modules/java/utils.js
@@ -74,10 +74,9 @@ function jdkRootRegistryKey(wow64) {
function findJdkPath(hostOS, arch, environmentPaths, searchPaths) {
var i;
- for (var key in environmentPaths) {
- if (environmentPaths[key]) {
- return environmentPaths[key];
- }
+ for (i = 0; i < environmentPaths.length; ++i) {
+ if (environmentPaths[i])
+ return environmentPaths[i];
}
if (hostOS.contains("windows")) {
@@ -347,7 +346,7 @@ function manifestContents(filePath) {
if (contents) {
var dict = {};
var lines = contents.split(/\r?\n/g).filter(function (line) { return line.length > 0; });
- for (var i in lines) {
+ for (var i = 0; i < lines.length; ++i) {
var kv = lines[i].split(":");
if (kv.length !== 2)
throw new Error("Syntax error in manifest file '"
diff --git a/tests/auto/blackbox/testdata/dynamic-project/dynamic-project.qbs b/tests/auto/blackbox/testdata/dynamic-project/dynamic-project.qbs
index 166648c80..52f7c940d 100644
--- a/tests/auto/blackbox/testdata/dynamic-project/dynamic-project.qbs
+++ b/tests/auto/blackbox/testdata/dynamic-project/dynamic-project.qbs
@@ -17,7 +17,7 @@ Project
var srcDir = FileInfo.joinPaths(sourceDir, "src");
var projectDirs = File.directoryEntries(srcDir, File.Dirs | File.NoDotAndDotDot);
var list = [];
- for (it in projectDirs) {
+ for (var it = 0; it < projectDirs.length; ++it) {
var name = projectDirs[it];
var productSrcDir = FileInfo.joinPaths(srcDir, name);
var productFilePath = FileInfo.joinPaths(tempDir, name + ".qbs");