aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2019-09-12 09:08:04 +0200
committerEike Ziller <eike.ziller@qt.io>2019-09-12 09:08:04 +0200
commit8df0653bf8cbb7778d5ab3e32890005874a5a92a (patch)
tree565663026d037862c755bcf80887138666bca7f2 /README.md
parent3a5ca31a7ebcc43427802d52bc825e4869d8619d (diff)
parenta21df46481f580d0f74b5f82f3f3ce1df2445129 (diff)
Merge remote-tracking branch 'origin/4.10'
Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/projectexplorer/gcctoolchain.cpp src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp Change-Id: Iffdf48e782a734107ea170ebb3812e997cea0e7b
Diffstat (limited to 'README.md')
-rw-r--r--README.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/README.md b/README.md
index 5706f34bf8..7ff6307201 100644
--- a/README.md
+++ b/README.md
@@ -272,6 +272,16 @@ http://llvm.org/docs/GettingStarted.html#git-mirror:
cmake -G "NMake Makefiles JOM" -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_RTTI=ON -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra" -DCMAKE_INSTALL_PREFIX=<installation location> ..\llvm-project\llvm
jom install
+### Clang-Format
+
+The ClangFormat plugin depends on the additional patch
+
+ https://code.qt.io/cgit/clang/clang.git/commit/?h=release_80-based&id=f98a155c89df094fb8f419a20629065f25fe599a
+
+While the plugin builds without it, it will be disabled on start with an error message.
+
+Note that the plugin is disabled by default.
+
## Third-party Components
Qt Creator includes the following third-party components,