aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2017-11-16 10:56:28 +0100
committerUlf Hermann <ulf.hermann@qt.io>2017-11-22 08:47:05 +0000
commit5e0639542fe753a3abe5d8412c2b368517b9b02e (patch)
tree11953cb00457a505734e8b8cbeb76793870c16d5 /README.md
parentb0137c3a01843ef8b16550b4c5d63c92aa9b8275 (diff)
Add some sanity to the clang detection code for qmake build
llvm-config can usually be found in PATH on systems which have standard paths at all. There is no need to specify LLVM_INSTALL_DIR then. Furthermore, llvm-config has an option --bindir which will tell us the directory where clang can be found (if installed). No need to apply strange heuristics based on LLVM_INSTALL_DIR. Finally, we can check within each .pro file for the conditions to be met using qmake's require() function. This way we don't need to fiddle with LLVM_INSTALL_DIR in unrelated places. Change-Id: I1a6ab092b06de40dfbfa4a9e7053451360fd24c8 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'README.md')
-rw-r--r--README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index 4376e79d92..0aef21f25c 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ The installed toolchains have to match the one Qt was compiled with.
You can build Qt Creator with
- # Optional, needed for the Clang Code Model:
+ # Optional, needed for the Clang Code Model if llvm-config is not in PATH:
export LLVM_INSTALL_DIR=/path/to/llvm (or "set" on Windows)
# Optional, needed to let the QbsProjectManager plugin use system Qbs:
export QBS_INSTALL_DIR=/path/to/qbs
@@ -129,7 +129,7 @@ For detailed information on the supported compilers, see
* Install LLVM/Clang - see the section "Get LLVM/Clang for the Clang
Code Model".
* Set the environment variable LLVM_INSTALL_DIR to the LLVM/Clang
- installation directory.
+ installation directory if llvm-config is not in PATH.
* When you launch Qt Creator, activate the Clang Code Model plugin as
described in doc/src/editors/creator-clang-codemodel.qdoc.