Merge branch 'CE-Programming:master' into reg-watchpoints

Author: Sightem

.github/workflows/build.linux.workflow.yml

@@ -37,6 +37,10 @@ jobs:
       run: |
         sudo sed -i 's/azure\.//' /etc/apt/sources.list
 
+    - name: Remove windows-only qt version override in vcpkg.json
+      run: |
+        sed -i '/For Windows only/d' ${{ github.workspace }}/gui/qt/vcpkg.json
+
     - name: Install dependencies
       run: |
         set -e

.github/workflows/build.mac.workflow.yml

@@ -8,8 +8,8 @@ on:
 
 jobs:
   build:
-    name: "Build: ${{ matrix.os }} ${{ matrix.archname }}"
-    runs-on: ${{ matrix.os }}
+    name: "Build: ${{ matrix.archname }}"
+    runs-on: macos-14
     strategy:
       fail-fast: false
       matrix:
@@ -18,21 +18,23 @@ jobs:
         include:
           - archname: "intel"
             arch: x64
-            os: macos-13
           - archname: "arm"
             arch: arm64
-            os: macos-14
 
     steps:
     - name: Checkout Git Repo
       uses: actions/checkout@v5
       with:
         submodules: 'recursive'
 
+    - name: Remove windows-only qt version override in vcpkg.json
+      run: |
+        sed -i '' '/For Windows only/d' ${{ github.workspace }}/gui/qt/vcpkg.json
+
     - name: Install dependencies
       run: |
         set -e
-        brew install automake autoconf libtool libusb
+        brew install automake autoconf autoconf-archive libtool
 
     - name: Install latest CMake
       uses: lukka/get-cmake@628dd514bed37cb0a609e84a6186cbbaa2fc0140 # latest as of 2025-10-04
@@ -50,7 +52,7 @@ jobs:
         configurePresetAdditionalArgs: "['-DDEPS_RELEASE_ONLY=ON', '-DSHORT_VERSION=v3.0']"
         buildPreset: 'Mac-${{ matrix.arch }}-${{ matrix.config }}'
       env:
-        VCPKG_DEFAULT_HOST_TRIPLET: ${{ matrix.arch }}-osx-release
+        VCPKG_DEFAULT_HOST_TRIPLET: arm64-osx-release
         VCPKG_FORCE_SYSTEM_BINARIES: 1
 
     - name: Move to temp folder

.github/workflows/coverity.workflow.yml

@@ -18,15 +18,23 @@ jobs:
       run: |
         set -e
         sudo apt-get update
-        sudo apt-get install qt6-base-dev qmake6 libgl1-mesa-dev libarchive-dev libudev-dev libusb-1.0-0-dev
+        sudo apt-get install qt6-base-dev qmake6 qtchooser libgl1-mesa-dev libarchive-dev libudev-dev libusb-1.0-0-dev
+
+    - name: set-up qt6
+      run: |
+        qtchooser -install qt6 $(which qmake6)
+        sudo mv ~/.config/qtchooser/qt6.conf /usr/share/qtchooser/qt6.conf
+        sudo mkdir -p /usr/lib/$(uname -p)-linux-gnu/qt-default/qtchooser
+        sudo ln -n /usr/share/qtchooser/qt6.conf /usr/lib/$(uname -p)-linux-gnu/qt-default/qtchooser/default.conf
+        echo "QT_SELECT=qt6" >> "$GITHUB_ENV"
         
     - name: Prepare build
       run: |
         set -e
         cd gui/qt/capture ; /bin/bash ./get_libpng-apng.sh ; cd ../../../
         mkdir build
         cd build
-        qmake ../gui/qt 
+        qmake6 ../gui/qt
     
     - uses: vapier/coverity-scan-action@v1
       with:

gui/qt/CMakeLists.txt

@@ -17,8 +17,19 @@ if(DEPS_RELEASE_ONLY)
     endif()
 endif()
 
+if(APPLE)
+    set(MAYBE_MACOSX_BUNDLE MACOSX_BUNDLE)
+    if(VCPKG_TARGET_TRIPLET MATCHES "^x64")
+        set(CMAKE_OSX_ARCHITECTURES "x86_64")
+        set(VCPKG_TARGET_ARCHITECTURE "x64")
+    else()
+        set(CMAKE_OSX_ARCHITECTURES "arm64")
+        set(VCPKG_TARGET_ARCHITECTURE "arm64")
+    endif()
+endif()
+
 project(CEmu
-        VERSION 2.0
+        VERSION 3.0
         LANGUAGES C CXX)
 
 if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../core/debug/zdis/zdis.c" OR
@@ -71,10 +82,6 @@ if(COMMAND qt_standard_project_setup)
     qt_standard_project_setup()
 endif()
 
-if(APPLE)
-    set(MAYBE_MACOSX_BUNDLE MACOSX_BUNDLE)
-endif()
-
 qt_add_resources(CEmu_Resources resources.qrc)
 
 set(CEmu_Sources

gui/qt/triplets/x64-osx-minver-release.cmake

@@ -119,7 +119,12 @@ bool isRunningInDarkMode() {
 }
 
 bool isSystemInDarkMode() {
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
     return qApp->styleHints()->colorScheme() == Qt::ColorScheme::Dark;
+#else
+    // TODO: handle other OS' way to know if we're running in dark mode
+    return isRunningInDarkMode();
+#endif
 }
 
 

gui/qt/triplets/x64-osx-minver.cmake

@@ -29,9 +29,6 @@
   ],
   "builtin-baseline": "a62ce77d56ee07513b4b67de1ec2daeaebfae51a",
   "overrides": [
-    {
-      "name": "qtbase",
-      "version": "6.6.3"
-    }
+    { "name": "qtbase", "version": "6.6.3", "$comment": "For Windows only due to UI issues later. For non-Windows, edited out in CI" }
   ]
 }