diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-03-01 12:20:57 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-03-01 13:06:57 +0200 |
| commit | cbfc6e522dced7516dbfa036197476796ca1dcf8 (patch) | |
| tree | e78aa7f496b1986d127e991da685bcc3382fa1f9 /qbs | |
| parent | 89831854059144613279affc4c37eb65dbcbf6e7 (diff) | |
| parent | aa14e396f03232ce97a723aaf18ab89f7dfad698 (diff) | |
Merge remote-tracking branch 'origin/4.9'
Change-Id: I801042a53ae4d02d1891ea582ca9ea89b00d3181
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 4d384d773e..3a75fe1ead 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 845ce4139c..4a0d6cab1d 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) } |