From 64ebf36f15118d55672e5222e8bb62da413328d1 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 10 Jun 2024 12:31:53 +0200 Subject: [PATCH] Fix various outdated information in README Change-Id: Ib626b611de25bb437266b8a013622a8f34e28324 Reviewed-by: Christian Kandeler --- README.md | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 7feacabd332..274c5094868 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ include the version number and compiler ABI. The path to the online installer content is not enough. Note that `/path/to/Qt` doesn't imply the full path depth like: -`$USER/Qt/6.2.4/gcc_64/lib/cmake/Qt6`, but only `$USER/Qt/6.2.4/gcc_64`. +`$USER/Qt/6.4.3/gcc_64/lib/cmake/Qt6`, but only `$USER/Qt/6.4.3/gcc_64`. See [instructions](#getting-llvmclang-for-the-clang-code-model) on how to get LLVM. @@ -145,7 +145,7 @@ include the version number and compiler ABI. The path to the online installer content is not enough. Note that `\path\to\Qt` doesn't imply the full path depth like: -`c:\Qt\6.2.4\msvc2019_64\lib\cmake\Qt6`, but only `c:/Qt/6.2.4/msvc2019_64`. +`c:\Qt\6.4.3\msvc2019_64\lib\cmake\Qt6`, but only `c:/Qt/6.4.3/msvc2019_64`. The usage of slashes `/` is intentional, since CMake has issues with backslashes `\` in `CMAKE_PREFX_PATH`, they are interpreted as escape codes. @@ -225,7 +225,7 @@ CLion...etc) locally: "cacheVariables": { "CMAKE_CXX_COMPILER": "cl.exe", "CMAKE_C_COMPILER": "cl.exe", - "CMAKE_PREFIX_PATH": "c:/Qt/6.2.4/msvc2019_64" + "CMAKE_PREFIX_PATH": "c:/Qt/6.4.3/msvc2019_64" } } ] @@ -313,7 +313,7 @@ http://llvm.org/docs/GettingStarted.html#git-mirror: 1. Clone LLVM/Clang and checkout a suitable branch - git clone -b release_130-based --recursive https://code.qt.io/clang/llvm-project.git + git clone -b release_17.0.6-based --recursive https://code.qt.io/clang/llvm-project.git 2. Build and install LLVM/Clang @@ -341,16 +341,6 @@ http://llvm.org/docs/GettingStarted.html#git-mirror: ..\llvm-project\llvm cmake --build . --target install -### Clang-Format - -The ClangFormat plugin depends on the additional patch - - https://code.qt.io/cgit/clang/llvm-project.git/commit/?h=release_130-based&id=42879d1f355fde391ef46b96a659afeb4ad7814a - -While the plugin builds without it, it might not be fully functional. - -Note that the plugin is disabled by default. - # Licenses and Attributions Qt Creator is available under commercial licenses from The Qt Company,