diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-11-28 08:24:10 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-11-28 08:24:10 +0100 |
| commit | 6fc85b49fa43c28af6f5726550513fd6974ebae8 (patch) | |
| tree | 74f917f587914a27642fe3b97a6130cbd1fac732 /README.md | |
| parent | 2059cb31f0544626e12b2fa828ca60f27cd8e2d3 (diff) | |
| parent | 6b1d54421e3831576c8d169bf38caf1ab503c84a (diff) | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
src/plugins/designer/codemodelhelpers.cpp
Change-Id: I78906f2fbbfd27d254589a272ebca423b0b80699
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -31,7 +31,6 @@ Prerequisites: * ActiveState Active Perl * MinGW with g++ 5.3 or Visual Studio 2017 or later * jom - * Ninja (optional, needed for CMake) * Python 3.5 or later (optional, needed for the python enabled debug helper) * On Mac OS X: latest Xcode * On Linux: g++ 5.3 or later @@ -40,6 +39,7 @@ Prerequisites: "Get LLVM/Clang for the Clang Code Model". The LLVM C++ API provides no compatibility garantee, so if later versions don't compile we don't support that version.) * CMake (for manual builds of LLVM/Clang, and Qt Creator itself) +* Ninja (optional, recommended for building with CMake) * Qbs 1.7.x (optional, sources also contain Qbs itself) The installed toolchains have to match the one Qt was compiled with. |