feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qbs build: Adapt to function renaming.

Browse Source 
Change-Id: Ia4cc4447e59aaa4f283a7818847633bb7cf9a8aa
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Christian Kandeler
2014-04-15 16:31:27 +02:00
parent 94eda40a95
commit 4909428220
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qtcreator.qbs
View File

@@ -45,7 +45,7 @@ Project {
property string ide_bin_path: qbs.targetOS.contains("osx") property string ide_bin_path: qbs.targetOS.contains("osx")
? ide_app_target + ".app/Contents/MacOS" ? ide_app_target + ".app/Contents/MacOS"
: ide_app_path : ide_app_path
property bool testsEnabled: qbs.getenv("TEST") || qbs.buildVariant === "debug" property bool testsEnabled: qbs.getEnv("TEST") || qbs.buildVariant === "debug"
property stringList generalDefines: [ property stringList generalDefines: [
"QT_CREATOR", "QT_CREATOR",
'IDE_LIBRARY_BASENAME="' + libDirName + '"', 'IDE_LIBRARY_BASENAME="' + libDirName + '"',

2
src/libs/ssh/ssh.qbs
View File

@@ -44,7 +44,7 @@ QtcLibrary {
"sshsendfacility.cpp", "sshsendfacility_p.h", "sshsendfacility.cpp", "sshsendfacility_p.h",
].concat(botanFiles) ].concat(botanFiles)
property var useSystemBotan: qbs.getenv("USE_SYSTEM_BOTAN") === "1" property var useSystemBotan: qbs.getEnv("USE_SYSTEM_BOTAN") === "1"
property var botanIncludes: { property var botanIncludes: {
var result = ["../3rdparty"]; var result = ["../3rdparty"];
if (useSystemBotan) if (useSystemBotan)

4
src/plugins/clangcodemodel/clangcodemodel.qbs
View File

@@ -11,7 +11,7 @@ QtcPlugin {
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "Utils" } Depends { name: "Utils" }
property string llvmInstallDir: qbs.getenv("LLVM_INSTALL_DIR") property string llvmInstallDir: qbs.getEnv("LLVM_INSTALL_DIR")
condition: llvmInstallDir && !llvmInstallDir.isEmpty condition: llvmInstallDir && !llvmInstallDir.isEmpty
property bool clangCompletion: true property bool clangCompletion: true
@@ -33,7 +33,7 @@ QtcPlugin {
} }
// Find llvm-config* in PATH // Find llvm-config* in PATH
var pathListString = qbs.getenv("PATH"); var pathListString = qbs.getEnv("PATH");
var separator = qbs.hostOS.contains("windows") ? ";" : ":"; var separator = qbs.hostOS.contains("windows") ? ";" : ":";
var pathList = pathListString.split(separator); var pathList = pathListString.split(separator);
for (var i = 0; i < llvmConfigVariants.length; ++i) { for (var i = 0; i < llvmConfigVariants.length; ++i) {

2
src/src.qbs
View File

@@ -12,7 +12,7 @@ Project {
] ]
property bool qbsSubModuleExists: File.exists(qbsProject.qbsBaseDir + "/qbs.qbs") property bool qbsSubModuleExists: File.exists(qbsProject.qbsBaseDir + "/qbs.qbs")
property path qbs_install_dir: qbs.getenv("QBS_INSTALL_DIR") property path qbs_install_dir: qbs.getEnv("QBS_INSTALL_DIR")
property bool useExternalQbs: qbs_install_dir property bool useExternalQbs: qbs_install_dir
property bool buildQbsProjectManager: useExternalQbs || qbsSubModuleExists property bool buildQbsProjectManager: useExternalQbs || qbsSubModuleExists
Project { Project {