From cafee32fd9c99cfd5a5167eaebb9cbab07138a95 Mon Sep 17 00:00:00 2001
From: Cameron White <cameronwhite91@gmail.com>
Date: Sat, 21 Sep 2024 23:48:39 -0400
Subject: [PATCH] Switch CI builds for Linux and Windows to Qt6

---
 .github/workflows/build.yml | 6 ++----
 README.md                   | 7 ++++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6eab0c38..b49823c3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,9 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Install Apt Dependencies
-      run: sudo apt update && sudo apt install ninja-build qtbase5-dev qttools5-dev libboost-dev libboost-date-time-dev libboost-iostreams-dev nlohmann-json3-dev libasound2-dev librtmidi-dev libminizip-dev doctest-dev
-    - name: Install Other Dependencies
-      run: vcpkg install pugixml
+      run: sudo apt update && sudo apt install ninja-build qt6-base-dev libglx-dev libgl1-mesa-dev qt6-tools libboost-dev libboost-date-time-dev libboost-iostreams-dev nlohmann-json3-dev libasound2-dev librtmidi-dev libpugixml-dev libminizip-dev doctest-dev
     - name: Create Build Directory
       run: cmake -E make_directory ${{runner.workspace}}/build
     - name: Generate Project
@@ -110,7 +108,7 @@ jobs:
       uses: jurplel/install-qt-action@v4
       with:
         arch: ${{ matrix.qt_arch }}
-        version: 5.15.2
+        version: 6.7.2
 
     - name: Generate Project
       run: cmake -A ${{ matrix.cmake_arch }} -B ./build -DPTE_ENABLE_PCH=1 -DCMAKE_TOOLCHAIN_FILE="${env:VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake"
diff --git a/README.md b/README.md
index 6a5a90a7..6cf27ef0 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ Power Tab Editor 2.0 - A powerful cross platform guitar tablature viewer and edi
 #### Windows:
 * Install Git - see https://help.github.com/articles/set-up-git
 * Install [vcpkg](https://github.com/microsoft/vcpkg) and run `vcpkg install --triplet x64-windows boost-algorithm boost-date-time boost-endian boost-functional boost-iostreams boost-rational boost-signals2 boost-stacktrace doctest minizip nlohmann-json pugixml` to install dependencies.
-* Install Qt by running `vcpkg install --triplet x64-windows qt5-base qt5-tools` (this may take a while), or install a binary release from the Qt website or https://github.com/miurahr/aqtinstall.
+* Install Qt by running `vcpkg install --triplet x64-windows qtbase qttools` (this may take a while), or install a binary release from the Qt website or https://github.com/miurahr/aqtinstall.
 * Open the project folder in Visual Studio and build.
   * If running CMake manually, set `CMAKE_TOOLCHAIN_FILE` to `[vcpkg root]\scripts\buildsystems\vcpkg.cmake`
 
@@ -109,8 +109,9 @@ You'll have to update the variables for your specific paths to `$vcpkg_exe_path`
 * These instructions assume a recent Ubuntu/Debian-based system, but the package names should be similar for other package managers.
 * Install dependencies:
   * `sudo apt update`
-  * `sudo apt install cmake qtbase5-dev qttools5-dev libboost-dev libboost-date-time-dev libboost-iostreams-dev nlohmann-json3-dev libasound2-dev librtmidi-dev libpugixml-dev libminizip-dev doctest-dev`
-  * `sudo apt-get install timidity-daemon` - timidity is not required for building, but is a good sequencer for MIDI playback.
+  * `sudo apt install cmake qt6-base-dev qt6-tools libboost-dev libboost-date-time-dev libboost-iostreams-dev nlohmann-json3-dev libasound2-dev librtmidi-dev libpugixml-dev libminizip-dev doctest-dev`
+    * You may also need to install `libglx-dev libgl1-mesa-dev` along with Qt6
+  * `sudo apt install timidity-daemon` - timidity is not required for building, but is a good sequencer for MIDI playback.
   * Optionally, use [Ninja](http://martine.github.io/ninja/) instead of `make` (`sudo apt install ninja-build`)
 * Build:
   * `mkdir build && cd build`