CI/Makefile: do allow Qt 6

I don't think we need to worry about Qt 4 any more.

Signed-off-by: Thiago Macieira <[email protected]>

Author: thiagomacieira

.github/workflows/build.yml

@@ -108,7 +108,7 @@ jobs:
         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 qt cjson
 
     - name: Execute tests
       run: |

Makefile

@@ -65,20 +65,6 @@ VERSION = $(shell cat $(SRCDIR)VERSION)
 SOVERSION = $(shell cut -f1-2 -d. $(SRCDIR)VERSION)
 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)
-    QMAKE := qmake -qt5
-    ifneq ($(call check_qmake,$(QMAKE)),5)
-      QMAKE := qmake-qt5
-      ifneq ($(call check_qmake,$(QMAKE)),5)
-        QMAKE := @echo >&2 $(MAKEFILE): Cannot find a Qt 5 qmake; false
-      endif
-    endif
-  endif
-endif
-
 -include .config
 
 ifeq ($(wildcard .config),)