diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a5a3c185305..1ebd9e134a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: pull_request: workflow_dispatch: -concurrency: +concurrency: group: build-${{ github.ref }} cancel-in-progress: true @@ -87,12 +87,12 @@ jobs: - name: Add Conan to path if: startsWith(matrix.os, 'windows') run: echo "C:\Program Files\Conan\conan\" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - + - name: Install dependencies (Windows) if: startsWith(matrix.os, 'windows') run: | choco install conan -y - + - name: Enable Developer Command Prompt if: startsWith(matrix.os, 'windows') uses: ilammy/msvc-dev-cmd@v1.10.0 @@ -122,7 +122,7 @@ jobs: if: startsWith(matrix.os, 'windows') run: conan remove "*" -fsb shell: bash - + # LINUX - name: Install dependencies (Ubuntu) if: startsWith(matrix.os, 'ubuntu') diff --git a/BUILDING_ON_LINUX.md b/BUILDING_ON_LINUX.md index 33bae257422..b37b90b2d0e 100644 --- a/BUILDING_ON_LINUX.md +++ b/BUILDING_ON_LINUX.md @@ -9,6 +9,8 @@ Note on Qt version compatibility: If you are installing Qt from a package manage _Most likely works the same for other Debian-like distros_ Install all of the dependencies using `sudo apt install qttools5-dev qtmultimedia5-dev qt5-image-formats-plugins libqt5svg5-dev libboost-dev libssl-dev libboost-system-dev libboost-filesystem-dev cmake g++` +1. Install all of the dependencies using `sudo apt install qttools5-dev qtmultimedia5-dev qt5-image-formats-plugin libqt5svg5-dev libboost-dev libssl-dev libboost-system-dev libboost-filesystem-dev cmake g++` +1. Optionally install QtSpell using `sudo apt install libqtspell-qt5-dev` ### Arch Linux diff --git a/CHANGELOG.md b/CHANGELOG.md index cb4ab8a5511..421711eb141 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Minor: Added a link to the upstream commit (Mm2PL/Dankerino#127) - Minor: Added RaccAttack URL to Twitch Emote context menu (Mm2PL/Dankerino#122) - Minor: Added a warning to not send bug reports to upstream (Mm2PL/Dankerino#128) +- Minor: Optionally support QtSpell for spell checking (Mm2PL/Dankerino#125) ### Chatterino - Major: Added multi-channel searching to search dialog via keyboard shortcut. (Ctrl+Shift+F by default) (#3694, #3875)