diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-10-09 12:09:27 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-10-09 12:09:27 +0200 |
| commit | 07bec99e8f7a0c07fbf2dbd2b58b8ecb97854c74 (patch) | |
| tree | 95e2617058e94eba6bed7007f0ebf7fc4a13c71f /qbs | |
| parent | b1701ae9333114bed9f41da9105263bc5557e35b (diff) | |
| parent | 86ff493b9949b8e09929da041c5ea4f6d111443e (diff) | |
Merge remote-tracking branch 'origin/4.5'
Conflicts:
src/plugins/debugger/debuggerruncontrol.cpp
src/plugins/projectexplorer/gcctoolchain.cpp
Change-Id: Iaad0659293681cce4266fc3e4ba2a4f2068de911
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/libclang/functions.js | 8 | ||||
| -rw-r--r-- | qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs | 2 | ||||
| -rw-r--r-- | qbs/modules/qtc/qtc.js | 6 |
3 files changed, 9 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/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs index a16eae5d41..492a6fe457 100644 --- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -4,6 +4,8 @@ import qbs.FileInfo Module { Depends { name: "qtc" } + property bool priority: 1 // TODO: Remove declaration after 1.11 is out. + property bool enableUnitTests: false property bool enableProjectFileUpdates: true property bool installApiHeaders: false 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) { |