CI: use qt6 on macOS

.github/workflows/build.yml

@@ -67,15 +67,15 @@ jobs:
           }
         ]
         include:
-          - os: macos-11
+          - os: macos-latest
             build_cfg: { "name": "clang",
                          "flags":
                            '{ "QMAKESPEC": "macx-clang",
                               "CFLAGS": "-Oz",
                               "QMAKEFLAGS": "-config debug",
                               "MAKEFLAGS": "-s",
                               "TESTARGS": "-silent",
-                              "PATH": "/usr/local/opt/qt5/bin:$PATH"
+                              "PATH": "/usr/local/opt/qt6/bin:$PATH"
                             }'
                         }
 
@@ -102,18 +102,18 @@ jobs:
           qtbase5-dev
 
     - name: install macOS software
-      if: matrix.os == 'macos-11'
+      if: matrix.os == 'macos-latest'
       run: |
         # Doxygen 1.9.7 is broken with ifdefs again, install 1.9.4 which works.
         wget https://raw.githubusercontent.com/Homebrew/homebrew-core/41828ee36b96e35b63b2a4c8cfc2df2c3728944a/Formula/doxygen.rb
         brew install doxygen.rb
         rm doxygen.rb
-        brew install qt5 cjson
+        brew install qt6 cjson
 
     # Valgrind takes a long time to build, so put in a separate step
     # to make it easy to disable.
     - name: install macOS valgrind
-      if: matrix.os == 'macos-11'
+      if: matrix.os == 'macos-latest'
       run: |
         # 3 cores on CI runners, so use make -j6 for homebrew.
         export HOMEBREW_MAKE_JOBS=6

Makefile

@@ -68,7 +68,9 @@ PACKAGE = tinycbor-$(VERSION)
 # Check that QMAKE is Qt 5
 ifeq ($(origin QMAKE),file)
   check_qmake = $(strip $(shell $(1) -query QT_VERSION 2>/dev/null | cut -b1))
-  ifneq ($(call check_qmake,$(QMAKE)),5)
+  ifeq ($(call check_qmake,$(QMAKE)),6)
+    QMAKE := qmake
+  else ifneq ($(call check_qmake,$(QMAKE)),5)
     QMAKE := qmake -qt5
     ifneq ($(call check_qmake,$(QMAKE)),5)
       QMAKE := qmake-qt5