Merge remote-tracking branch 'origin/4.1'

 Conflicts:
	README.md

Change-Id: I21f96ebb85b8a2b55b4d8066f3c9d4aba5e9b7ee

1 files changed, 4 insertions, 1 deletions

diff --git a/README.md b/README.md
index d195cbf679..05efbffd27 100644
--- a/README.md
+++ b/README.md
@@ -21,12 +21,15 @@ 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
+* LLVM 3.8.0 or later (optional, needed for the Clang Code Model)
 
 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:
+    export LLVM_INSTALL_DIR=/path/to/llvm (or "set" on Windows)
+
     cd $SOURCE_DIRECTORY
     qmake -r
     make (or mingw32-make or nmake or jom, depending on your platform)