Bump Qt and CI script versions, fix macOS support, and drop support f…

…or qmake (#98)

.github/workflows/build.yml

@@ -14,10 +14,10 @@ jobs:
   build:
     strategy:
       matrix:
-        qt_version: [5.12.11, 5.15.2, 6.2.0]
+        qt_version: [5.12.12, 5.15.2, 6.2.2]
         platform: [ubuntu-20.04, windows-latest, macos-latest]
         include:
-          - qt_version: 6.2.0
+          - qt_version: 6.2.2
             additional_arguments: -D QT_DEFAULT_MAJOR_VERSION=6
           - platform: ubuntu-20.04
             make: make
@@ -41,31 +41,16 @@ jobs:
         uses: actions/[email protected]
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2.14.0
+        uses: jurplel/install-qt-action@v3.3.0
         with:
           version: ${{ matrix.qt_version }}
 
       - name: Build with CMake as static
         run: |
-          cmake . -D QHOTKEY_EXAMPLES=ON ${{ matrix.additional_arguments }}
+          cmake . -D QHOTKEY_EXAMPLES=ON -D CMAKE_OSX_ARCHITECTURES="x86_64" ${{ matrix.additional_arguments }}
           cmake --build .
 
       - name: Build with CMake as shared
         run: |
-          cmake . -D BUILD_SHARED_LIBS=ON -D QHOTKEY_EXAMPLES=ON ${{ matrix.additional_arguments }}
+          cmake . -D BUILD_SHARED_LIBS=ON -D QHOTKEY_EXAMPLES=ON -D CMAKE_OSX_ARCHITECTURES="x86_64" ${{ matrix.additional_arguments }}
           cmake --build .
-
-      - name: Setup MSVC environment for QMake
-        uses: ilammy/msvc-dev-cmd@v1
-
-      - name: Build with QMake as static
-        working-directory: HotkeyTest
-        run: |
-          qmake
-          ${{ matrix.make }}
-
-      - name: Build with QMake as shared
-        working-directory: HotkeyTest
-        run: |
-          qmake "DEFINES+=QHOTKEY_SHARED QHOTKEY_LIBRARY"
-          ${{ matrix.make }}

README.md

@@ -16,7 +16,7 @@ The QHotkey is a class that can be used to create hotkeys/global shortcuts, aka
 
 ## Building
 
-QHotkey supports both Qt6 and Qt5. When using Qt6, version 6.2.0 or later required. It can be built by either the CMake or qmake building systems.
+QHotkey supports both Qt6 and Qt5. When using Qt6, version 6.2.0 or later required. It can be built using the CMake building system.
 
 ### CMake
 
@@ -29,17 +29,6 @@ $ cmake --build build
 # cmake --install build
 ```
 
-### qmake
-
-The major version of Qt is chosen by the qmake invocation itself, as the qmake executable is tied to a specific Qt version. The executable name can vary between operating systems. qmake example usage:
-
-```
-$ cd QHotkey
-$ qmake
-$ make
-# make install
-```
-
 ## Installation
 The package is providet as qpm  package, [`de.skycoder42.qhotkey`](https://www.qpm.io/packages/de.skycoder42.qhotkey/index.html). You can install it either via qpmx (preferred) or directly via qpm.