From a6d12177adf07870ddfb8e72f4630a084a0f06f4 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 2 Oct 2017 17:30:25 +0200 Subject: [PATCH] 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 Reviewed-by: Joerg Bornemann --- qbs/modules/libclang/functions.js | 8 ++++---- 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 5ad07af8fa6..17d1bc4f9a6 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 7183592b7b7..375841af4e3 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) {