aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2016-07-11 10:46:05 +0200
committerEike Ziller <eike.ziller@qt.io>2016-07-11 10:46:05 +0200
commit546df37c9894c5d444e3c40a21110077b8dc7a44 (patch)
tree15e4ac4676373bdd25ccac527baca38706d15368 /README.md
parent717ff381401d559a338c1d4613c6af53735dcb91 (diff)
parent9650adad140dbcec0ee5f464c2bbcb9d9da05133 (diff)
Merge remote-tracking branch 'origin/4.1'
Conflicts: README.md src/plugins/modeleditor/actionhandler.cpp Change-Id: I65c2885593b881eda94872168a3891cab9cafe71
Diffstat (limited to 'README.md')
-rw-r--r--README.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/README.md b/README.md
index bef59ad6c7..d195cbf679 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ Prerequisites:
* jom
* On Mac OS X: latest Xcode
* On Linux: g++ 4.8 or later
+* LLVM 3.8.0 or later for the Clang Code Model
The installed toolchains have to match the one Qt was compiled with.
@@ -114,7 +115,7 @@ For detailed information on the supported compilers, see
command...` error. If a `sh.exe` is found, the compile process will fail.
You have to remove it from the path.
- 10. To enable the Clang-based code model: Install Clang (>= version 3.6.2)
+ 10. To enable the Clang-based code model: Install Clang (>= version 3.8.0)
and set the environment variable LLVM_INSTALL_DIR to point to the
installation location.