diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-08-10 14:23:50 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-08-10 15:56:54 +0200 |
| commit | 3944162039d9cea30384a0d867afab35cc3bfabf (patch) | |
| tree | ec07f797055a69823f47edff588f5dc82a1dfeca /README.md | |
| parent | 84e4b3af31364973c44ad52c8c01430d42f996a4 (diff) | |
| parent | acadee710e00cca55736db864263bdcdcbac31a6 (diff) | |
| download | qt-creator-3944162039d9cea30384a0d867afab35cc3bfabf.tar.gz | |
Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
src/plugins/cmakeprojectmanager/cmakebuildstep.h
tests/auto/debugger/tst_namedemangler.cpp
tests/auto/qml/codemodel/check/tst_check.cpp
Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -258,7 +258,7 @@ http://llvm.org/docs/GettingStarted.html#git-mirror: 1. Clone LLVM/Clang and checkout a suitable branch - git clone -b release_80-based --recursive https://code.qt.io/clang/llvm-project.git + git clone -b release_100-based --recursive https://code.qt.io/clang/llvm-project.git 2. Build and install LLVM/Clang @@ -278,7 +278,7 @@ http://llvm.org/docs/GettingStarted.html#git-mirror: For Windows: cmake ^ - -G "NMake Makefiles JOM" ^ + -G Ninja ^ -D CMAKE_BUILD_TYPE=Release ^ -D LLVM_ENABLE_RTTI=ON ^ -D LLVM_ENABLE_PROJECTS="clang;clang-tools-extra" ^ @@ -290,7 +290,7 @@ http://llvm.org/docs/GettingStarted.html#git-mirror: The ClangFormat plugin depends on the additional patch - https://code.qt.io/cgit/clang/clang.git/commit/?h=release_80-based&id=fa1b9053729ec6a4425a44ec5502dd388928274a + https://code.qt.io/cgit/clang/llvm-project.git/commit/?h=release_100-based&id=9b992a0f7f160dd6c75f20a4dcfcf7c60a4894df While the plugin builds without it, it will be disabled on start with an error message. |