Skip to content

Commit 4924cd5

Browse files
committed
feat: fix build instructions with qt6/kf6
1 parent 8b341c1 commit 4924cd5

4 files changed

Lines changed: 25 additions & 24 deletions

File tree

content/docs/installation/build-from-source/_index.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,28 @@ description: In this way, you can get the latest unreleased features and get rea
1717
cd cpeditor
1818
```
1919

20-
2. Install [Qt](https://www.qt.io/download) (5.15), [CMake](https://cmake.org/download/) (3.12 or higher) and [Python3](https://www.python.org/downloads/).
20+
2. Install [Qt](https://www.qt.io/download) (6.5 or higher), [CMake](https://cmake.org/download/) (3.16 or higher) and [Python3](https://www.python.org/downloads/).
2121

22-
- On some Linux distributions and macOS, you can install from your package manager. For example, `sudo pacman -S qt5-base` on Arch Linux, `brew install qt@5` on macOS.
22+
- On some Linux distributions and macOS, you can install from your package manager. For example, `sudo pacman -S qt6-base` on Arch Linux, `brew install qt` on macOS.
2323
- You can also use [aqtinstall](https://github.com/miurahr/aqtinstall) to install Qt.
2424

2525
3. If CMake can't find the Qt installation path, you should set the environment variable: `CMAKE_PREFIX_PATH=%QtPath%/%QtVersion%/%Compiler%/lib/cmake`. For example, on macOS, you can run something like `export CMAKE_PREFIX_PATH="/usr/local/Cellar/qt/5.15.2"`.
2626
27-
4. Install [Extra CMake Modules](https://github.com/KDE/extra-cmake-modules) and [KDE (kf5) Syntax Highlighting](https://github.com/KDE/syntax-highlighting). These are **not** bundled as submodules and must be installed on the host system before building.
27+
4. Install [Extra CMake Modules](https://github.com/KDE/extra-cmake-modules) and [KDE (kf6) Syntax Highlighting](https://github.com/KDE/syntax-highlighting). These are **not** bundled as submodules and must be installed on the host system before building.
2828
29-
- On some Linux distributions and macOS, you can install from your package manager. For example, `sudo pacman -S syntax-highlighting5` on Arch Linux, [Homebrew KDE](https://github.com/KDE/homebrew-kde) and then `brew install kde-mac/kde/kf5-syntax-highlighting` on macOS.
29+
- On some Linux distributions and macOS, you can install from your package manager. For example, `sudo pacman -S syntax-highlighting` on Arch Linux.
30+
- For macOS with Homebrew, you may need to build from source as KF6 formulas are not yet available in the [Homebrew KDE](https://github.com/KDE/homebrew-kde) tap.
3031
3132
- Otherwise, you can clone and build them manually:
3233
3334
```sh
34-
git clone --branch kf5 https://github.com/KDE/extra-cmake-modules.git
35+
git clone https://github.com/KDE/extra-cmake-modules.git
3536
cd extra-cmake-modules
3637
cmake -B build -S . -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF
3738
cmake --build build --config Release --target install # may require sudo
3839
cd ..
3940
40-
git clone --branch kf5 https://github.com/KDE/syntax-highlighting.git
41+
git clone https://github.com/KDE/syntax-highlighting.git
4142
cd syntax-highlighting
4243
cmake -B build -S . -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF
4344
cmake --build build --config Release --target install # may require sudo

content/docs/installation/build-from-source/_index.ru.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@ description: In this way, you can get the latest unreleased features and get rea
1212
cd cpeditor
1313
```
1414

15-
2. Install [Qt](https://www.qt.io/download) (5.15 or higher), [CMake](https://cmake.org/download/) (3.12 or higher) and [Python3](https://www.python.org/downloads/).
16-
- On some Linux distributions and macOS, you can install from your package manager. For example, `sudo pacman -S qt5` on Arch Linux, `brew install qt5` on macOS.
15+
2. Install [Qt](https://www.qt.io/download) (6.5 or higher), [CMake](https://cmake.org/download/) (3.16 or higher) and [Python3](https://www.python.org/downloads/).
16+
- On some Linux distributions and macOS, you can install from your package manager. For example, `sudo pacman -S qt6-base` on Arch Linux, `brew install qt` on macOS.
1717
- You can also use [aqtinstall](https://github.com/miurahr/aqtinstall) to install Qt.
1818

1919
3. If CMake can't find the Qt installation path, you should set the environment variable: `CMAKE_PREFIX_PATH=%QtPath%/%QtVersion%/%Compiler%/lib/cmake`. For example, on macOS, you can run something like `export CMAKE_PREFIX_PATH="/usr/local/Cellar/qt/5.15.1"`.
2020
21-
4. Install [Extra CMake Modules](https://github.com/KDE/extra-cmake-modules) and [KDE (kf5) Syntax Highlighting](https://github.com/KDE/syntax-highlighting). These are **not** bundled as submodules and must be installed on the host system before building.
21+
4. Install [Extra CMake Modules](https://github.com/KDE/extra-cmake-modules) and [KDE (kf6) Syntax Highlighting](https://github.com/KDE/syntax-highlighting). These are **not** bundled as submodules and must be installed on the host system before building.
2222
23-
- On some Linux distributions and macOS, you can install from your package manager. For example, `sudo pacman -S syntax-highlighting5` on Arch Linux, [Homebrew KDE](https://github.com/KDE/homebrew-kde) and then `brew install kde-mac/kde/kf5-syntax-highlighting` on macOS.
23+
- On some Linux distributions and macOS, you can install from your package manager. For example, `sudo pacman -S syntax-highlighting` on Arch Linux.
2424
2525
- Otherwise, you can clone and build them manually:
2626
2727
```sh
28-
git clone --branch kf5 https://github.com/KDE/extra-cmake-modules.git
28+
git clone https://github.com/KDE/extra-cmake-modules.git
2929
cd extra-cmake-modules
3030
cmake -B build -S . -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF
3131
cmake --build build --config Release --target install # may require sudo
3232
cd ..
3333
34-
git clone --branch kf5 https://github.com/KDE/syntax-highlighting.git
34+
git clone https://github.com/KDE/syntax-highlighting.git
3535
cd syntax-highlighting
3636
cmake -B build -S . -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF
3737
cmake --build build --config Release --target install # may require sudo

content/docs/installation/build-from-source/_index.zh.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,26 @@ description: 通过这种方式,你可以使用最新的还未发布的特性
1717
cd cpeditor
1818
```
1919

20-
2. 安装 [Qt](https://www.qt.io/download)(5.15), [CMake](https://cmake.org/download/)(3.12 或更高版本)以及 [Python3](https://www.python.org/downloads/)。
21-
- 在一些 Linux 发行版和 macOS 系统上,你可以直接使用包管理器安装 Qt。例如,在 Arch Linux 上可以使用 `sudo pacman -S qt5-base`,在 macOS 上可以使用 `brew install qt@5`
20+
2. 安装 [Qt](https://www.qt.io/download)(6.5 或更高版本), [CMake](https://cmake.org/download/)(3.16 或更高版本)以及 [Python3](https://www.python.org/downloads/)。
21+
- 在一些 Linux 发行版和 macOS 系统上,你可以直接使用包管理器安装 Qt。例如,在 Arch Linux 上可以使用 `sudo pacman -S qt6-base`,在 macOS 上可以使用 `brew install qt`
2222
- 你还可以使用 [aqtinstall](https://github.com/miurahr/aqtinstall) 来下载并安装。
2323

2424
3. 如果 CMake 提示找不到 Qt 路径,你应该设置环境变量:`CMAKE_PREFIX_PATH=%QtPath%/%QtVersion%/%Compiler%/lib/cmake`。例如,在 macOS 上,你可以运行 `export CMAKE_PREFIX_PATH="/usr/local/Cellar/qt/5.15.2"`
2525

26-
4. 安装 [Extra CMake Modules](https://github.com/KDE/extra-cmake-modules) 和 [KDE (kf5) Syntax Highlighting](https://github.com/KDE/syntax-highlighting)。它们**不再**作为子模块捆绑,必须在构建前安装到系统中。
26+
4. 安装 [Extra CMake Modules](https://github.com/KDE/extra-cmake-modules) 和 [KDE (kf6) Syntax Highlighting](https://github.com/KDE/syntax-highlighting)。它们**不再**作为子模块捆绑,必须在构建前安装到系统中。
2727

28-
- 在一些 Linux 发行版和 macOS 系统上,你可以直接使用包管理器安装它们。例如,在 Arch Linux 上可以使用 `sudo pacman -S syntax-highlighting5`,在 macOS 上可以使用 [Homebrew KDE](https://github.com/KDE/homebrew-kde) 然后 `brew install kde-mac/kde/kf5-syntax-highlighting`
28+
- 在一些 Linux 发行版和 macOS 系统上,你可以直接使用包管理器安装它们。例如,在 Arch Linux 上可以使用 `sudo pacman -S syntax-highlighting`
2929

3030
- 否则,你需要手动克隆并构建安装:
3131

3232
```sh
33-
git clone --branch kf5 https://github.com/KDE/extra-cmake-modules.git
33+
git clone https://github.com/KDE/extra-cmake-modules.git
3434
cd extra-cmake-modules
3535
cmake -B build -S . -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF
3636
cmake --build build --config Release --target install # 可能需要 sudo
3737
cd ..
3838
39-
git clone --branch kf5 https://github.com/KDE/syntax-highlighting.git
39+
git clone https://github.com/KDE/syntax-highlighting.git
4040
cd syntax-highlighting
4141
cmake -B build -S . -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF
4242
cmake --build build --config Release --target install # 可能需要 sudo

content/docs/installation/build-from-source/_index.zh_tw.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@ description: 此方式適合想要嘗鮮最新功能的使用者、協助進行
1212
cd cpeditor
1313
```
1414

15-
2. 安裝 [Qt](https://www.qt.io/download) (5.15 or higher), [CMake](https://cmake.org/download/) (3.12 or higher) 及 [Python3](https://www.python.org/downloads/)。
16-
- 在 macOS 及某些 Linux 發行版,您可以透過套件管理系統來安裝。例如在 Arch Linux 上使用 `sudo pacman -S qt5`,在 macOS 上使用`brew install qt5`
15+
2. 安裝 [Qt](https://www.qt.io/download) (6.5 or higher), [CMake](https://cmake.org/download/) (3.16 or higher) 及 [Python3](https://www.python.org/downloads/)。
16+
- 在 macOS 及某些 Linux 發行版,您可以透過套件管理系統來安裝。例如在 Arch Linux 上使用 `sudo pacman -S qt6-base`,在 macOS 上使用`brew install qt`
1717
- 您也可以用 [aqtinstall](https://github.com/miurahr/aqtinstall) 安裝 Qt。
1818

1919
3. 若 CMake 找不到 Qt 的安裝路徑,需要設定環境變數:`CMAKE_PREFIX_PATH=%QtPath%/%QtVersion%/%Compiler%/lib/cmake`。以 macOS 而言,執行這個命令 `export CMAKE_PREFIX_PATH="/usr/local/Cellar/qt/5.15.1"`
2020

21-
4. 安裝 [Extra CMake Modules](https://github.com/KDE/extra-cmake-modules) 和 [KDE (kf5) Syntax Highlighting](https://github.com/KDE/syntax-highlighting)。它們**不再**作為子模組捆綁,必須在建置前安裝到系統中。
21+
4. 安裝 [Extra CMake Modules](https://github.com/KDE/extra-cmake-modules) 和 [KDE (kf6) Syntax Highlighting](https://github.com/KDE/syntax-highlighting)。它們**不再**作為子模組捆綁,必須在建置前安裝到系統中。
2222

23-
- 在 macOS 及某些 Linux 發行版,您可以透過套件管理系統來安裝。例如在 Arch Linux 上使用 `sudo pacman -S syntax-highlighting5`,在 macOS 上使用 [Homebrew KDE](https://github.com/KDE/homebrew-kde) 然後 `brew install kde-mac/kde/kf5-syntax-highlighting`
23+
- 在 macOS 及某些 Linux 發行版,您可以透過套件管理系統來安裝。例如在 Arch Linux 上使用 `sudo pacman -S syntax-highlighting`
2424

2525
- 否則,您需要手動 clone 並建置安裝:
2626

2727
```sh
28-
git clone --branch kf5 https://github.com/KDE/extra-cmake-modules.git
28+
git clone https://github.com/KDE/extra-cmake-modules.git
2929
cd extra-cmake-modules
3030
cmake -B build -S . -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF
3131
cmake --build build --config Release --target install # 可能需要 sudo
3232
cd ..
3333
34-
git clone --branch kf5 https://github.com/KDE/syntax-highlighting.git
34+
git clone https://github.com/KDE/syntax-highlighting.git
3535
cd syntax-highlighting
3636
cmake -B build -S . -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF
3737
cmake --build build --config Release --target install # 可能需要 sudo

0 commit comments

Comments
 (0)