diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-07-04 13:52:40 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-07-04 15:00:34 +0200 |
| commit | 6e432eef926e40278bca6c0281a6f36c56b099af (patch) | |
| tree | 15daa564d3e50bd2d6597c9c35d7aad9e589d154 | |
| parent | d7f410d61aa5016abf006e232e1053c456c48597 (diff) | |
| download | qbs-6e432eef926e40278bca6c0281a6f36c56b099af.tar.gz | |
Fix more outdated usages of JS extensions.
Change-Id: I10690f02f6e54c711c2547a223762b77e286e015
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | share/qbs/modules/cpp/bundle-tools.js | 6 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/windows-msvc.qbs | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/share/qbs/modules/cpp/bundle-tools.js b/share/qbs/modules/cpp/bundle-tools.js index 25fb8dcb6..2913d8d1c 100644 --- a/share/qbs/modules/cpp/bundle-tools.js +++ b/share/qbs/modules/cpp/bundle-tools.js @@ -30,7 +30,7 @@ function infoPlistContents(infoPlistFilePath) var process = new Process(); process.start("plutil", ["-convert", "json", "-o", "-", infoPlistFilePath]); process.waitForFinished(); - return JSON.parse(process.readAll()); + return JSON.parse(process.readStdOut()); } function infoPlistFormat(infoPlistFilePath) @@ -42,7 +42,7 @@ function infoPlistFormat(infoPlistFilePath) var process = new Process(); process.start("plutil", ["-lint", infoPlistFilePath]); process.waitForFinished(); - var lint = process.readAll().trim(); + var lint = process.readStdOut().trim(); if (lint.indexOf(infoPlistFilePath + ": ") !== 0) throw("Unexpected output from plutil command: " + lint); @@ -54,7 +54,7 @@ function infoPlistFormat(infoPlistFilePath) process = new Process(); process.start("file", [infoPlistFilePath]); process.waitForFinished(); - var magic = process.readAll().trim(); + var magic = process.readStdOut().trim(); if (magic.indexOf(infoPlistFilePath + ": ") !== 0) throw("Unexpected output from file command: " + magic); diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs index 088aabd44..8ff906038 100644 --- a/share/qbs/modules/cpp/windows-msvc.qbs +++ b/share/qbs/modules/cpp/windows-msvc.qbs @@ -1,4 +1,5 @@ import qbs 1.0 +import qbs.File import qbs.fileinfo as FileInfo import '../utils.js' as ModUtils import 'windows.js' as Windows |