Skip to content

Commit b519155

Browse files
CuperinoCuperino
authored
Bump Qt and CI script versions, fix macOS support, and drop support for qmake (#98)
1 parent cd72a01 commit b519155

File tree

8 files changed

+6
-112
lines changed

8 files changed

+6
-112
lines changed

‎.github/workflows/build.yml

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
build:
1515
strategy:
1616
matrix:
17-
qt_version: [5.12.11, 5.15.2, 6.2.0]
17+
qt_version: [5.12.12, 5.15.2, 6.2.2]
1818
platform: [ubuntu-20.04, windows-latest, macos-latest]
1919
include:
20-
- qt_version: 6.2.0
20+
- qt_version: 6.2.2
2121
additional_arguments: -D QT_DEFAULT_MAJOR_VERSION=6
2222
- platform: ubuntu-20.04
2323
make: make
@@ -41,31 +41,16 @@ jobs:
4141
uses: actions/checkout@v2.3.4
4242

4343
- name: Install Qt
44-
uses: jurplel/install-qt-action@v2.14.0
44+
uses: jurplel/install-qt-action@v3.3.0
4545
with:
4646
version: ${{ matrix.qt_version }}
4747

4848
- name: Build with CMake as static
4949
run: |
50-
cmake . -D QHOTKEY_EXAMPLES=ON ${{ matrix.additional_arguments }}
50+
cmake . -D QHOTKEY_EXAMPLES=ON -D CMAKE_OSX_ARCHITECTURES="x86_64" ${{ matrix.additional_arguments }}
5151
cmake --build .
5252
5353
- name: Build with CMake as shared
5454
run: |
55-
cmake . -D BUILD_SHARED_LIBS=ON -D QHOTKEY_EXAMPLES=ON ${{ matrix.additional_arguments }}
55+
cmake . -D BUILD_SHARED_LIBS=ON -D QHOTKEY_EXAMPLES=ON -D CMAKE_OSX_ARCHITECTURES="x86_64" ${{ matrix.additional_arguments }}
5656
cmake --build .
57-
58-
- name: Setup MSVC environment for QMake
59-
uses: ilammy/msvc-dev-cmd@v1
60-
61-
- name: Build with QMake as static
62-
working-directory: HotkeyTest
63-
run: |
64-
qmake
65-
${{ matrix.make }}
66-
67-
- name: Build with QMake as shared
68-
working-directory: HotkeyTest
69-
run: |
70-
qmake "DEFINES+=QHOTKEY_SHARED QHOTKEY_LIBRARY"
71-
${{ matrix.make }}

‎HotkeyTest/HotkeyTest.pro

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎QHotkey.pro

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎QHotkey/QHotkey.pro

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎QHotkey/qhotkey.pri

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎README.md

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The QHotkey is a class that can be used to create hotkeys/global shortcuts, aka
1616

1717
## Building
1818

19-
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.
19+
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.
2020

2121
### CMake
2222

@@ -29,17 +29,6 @@ $ cmake --build build
2929
# cmake --install build
3030
```
3131

32-
### qmake
33-
34-
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:
35-
36-
```
37-
$ cd QHotkey
38-
$ qmake
39-
$ make
40-
# make install
41-
```
42-
4332
## Installation
4433
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.
4534

‎qhotkey.prc

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎qhotkey.pri

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy