diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-02 17:30:25 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-04 08:18:15 +0000 |
| commit | a6d12177adf07870ddfb8e72f4630a084a0f06f4 (patch) | |
| tree | d58b7572a7d0ad5edad895ca243c149b3674aac2 /qbs/modules | |
| parent | 84b57027c838712ea2e28efd8641a6427d90e08a (diff) | |
| download | qt-creator-a6d12177adf07870ddfb8e72f4630a084a0f06f4.tar.gz | |
qbs build: Use require() instead of loadExtension()
This fixes a number of deprecation warnings. The require() function was
introduced in qbs 1.8 and is safe to use now.
Change-Id: I915a9f62f36fc64086c7dce60ea753d3e564127c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qbs/modules')
| -rw-r--r-- | qbs/modules/libclang/functions.js | 8 | ||||
| -rw-r--r-- | qbs/modules/qtc/qtc.js | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js index 5ad07af8fa..17d1bc4f9a 100644 --- a/qbs/modules/libclang/functions.js +++ b/qbs/modules/libclang/functions.js @@ -1,8 +1,8 @@ -var Environment = loadExtension("qbs.Environment") -var File = loadExtension("qbs.File") -var FileInfo = loadExtension("qbs.FileInfo") +var Environment = require("qbs.Environment") +var File = require("qbs.File") +var FileInfo = require("qbs.FileInfo") var MinimumLLVMVersion = "3.9.0" -var Process = loadExtension("qbs.Process") +var Process = require("qbs.Process") function readOutput(executable, args) { diff --git a/qbs/modules/qtc/qtc.js b/qbs/modules/qtc/qtc.js index 7183592b7b..375841af4e 100644 --- a/qbs/modules/qtc/qtc.js +++ b/qbs/modules/qtc/qtc.js @@ -1,6 +1,6 @@ -var File = loadExtension("qbs.File"); -var FileInfo = loadExtension("qbs.FileInfo"); -var TextFile = loadExtension("qbs.TextFile"); +var File = require("qbs.File"); +var FileInfo = require("qbs.FileInfo"); +var TextFile = require("qbs.TextFile"); function getExportBlock(productFile) { |