diff options
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/libclang/functions.js | 4 | ||||
| -rw-r--r-- | qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js index 4d384d773e4..3a75fe1ead9 100644 --- a/qbs/modules/libclang/functions.js +++ b/qbs/modules/libclang/functions.js @@ -103,6 +103,10 @@ function extraLibraries(llvmConfig, targetOS) function formattingLibs(llvmConfig, qtcFunctions, targetOS) { + var llvmIncludeDir = includeDir(llvmConfig); + if (!File.exists(llvmIncludeDir.concat("/clang/Format/Format.h"))) + return []; + var clangVersion = version(llvmConfig) var libs = [] if (qtcFunctions.versionIsAtLeast(clangVersion, MinimumLLVMVersion)) { diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs index 845ce4139c6..4a0d6cab1d0 100644 --- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -25,7 +25,7 @@ Module { property string relativeLibexecPath: FileInfo.relativePath('/' + appInstallDir, '/' + libexecInstallDir) property string relativePluginsPath: FileInfo.relativePath('/' + appInstallDir, - '/' + pluginsInstallDir) + '/' + qtc.ide_plugin_path) property string relativeSearchPath: FileInfo.relativePath('/' + appInstallDir, '/' + resourcesInstallDir) } |