Skip to content

Commit 66400cc

Browse files
DanielNicolettiKDABmilianw
DanielNicolettiKDAB
authored and
milianw
committed
feat: Drop Qt5 support
1 parent c072239 commit 66400cc

File tree

11 files changed

+34
-247
lines changed

11 files changed

+34
-247
lines changed

‎.github/workflows/compile-and-test.yml‎

Lines changed: 22 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -15,52 +15,6 @@ jobs:
1515
concurrent_skipping: 'same_content'
1616
do_not_skip: '["pull_request", "workflow_dispatch", "schedule"]'
1717

18-
ubuntu-2004:
19-
needs: pre_job
20-
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
21-
22-
runs-on: ubuntu-latest
23-
container: ghcr.io/kdab/hotspot-ubuntu20.04-dependencies
24-
25-
steps:
26-
- name: Checkout
27-
uses: actions/checkout@v4
28-
with:
29-
submodules: recursive
30-
31-
- name: Configure
32-
run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -G Ninja
33-
-DCMAKE_CXX_FLAGS_INIT="-g -fsanitize=address,undefined -Werror"
34-
-DCMAKE_C_FLAGS_INIT="-g -fsanitize=address,undefined -Werror"
35-
36-
- name: Build
37-
run: cmake --build build
38-
39-
- name: Test
40-
run: cd build && ctest --output-on-failure -E tst_perfdata
41-
42-
ubuntu-2204:
43-
needs: pre_job
44-
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
45-
46-
runs-on: ubuntu-latest
47-
container: ghcr.io/kdab/hotspot-ubuntu22.04-dependencies
48-
49-
steps:
50-
- name: Checkout
51-
uses: actions/checkout@v4
52-
with:
53-
submodules: recursive
54-
55-
- name: Configure
56-
run: cmake --preset dev-asan -DCMAKE_CXX_FLAGS_INIT=-Werror -DCMAKE_C_FLAGS_INIT=-Werror
57-
58-
- name: Build
59-
run: cmake --build build-dev-asan
60-
61-
- name: Test
62-
run: ctest --preset dev-asan
63-
6418
archlinux-gcc:
6519
needs: pre_job
6620
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
@@ -75,14 +29,14 @@ jobs:
7529
submodules: recursive
7630

7731
- name: Configure
78-
run: cmake --preset dev-asan-qt6
32+
run: cmake --preset dev-asan
7933
-DCMAKE_CXX_FLAGS_INIT=-Werror -DCMAKE_C_FLAGS_INIT=-Werror
8034

8135
- name: Build
82-
run: cmake --build --preset dev-asan-qt6
36+
run: cmake --build --preset dev-asan
8337

8438
- name: Test
85-
run: ctest --preset dev-asan-qt6
39+
run: ctest --preset dev-asan
8640

8741
archlinux-clang-clazy:
8842
needs: pre_job
@@ -98,13 +52,13 @@ jobs:
9852
submodules: recursive
9953

10054
- name: Configure
101-
run: cmake --preset dev-clazy-qt6
55+
run: cmake --preset dev-clazy
10256

10357
- name: Build
104-
run: cmake --build --preset dev-clazy-qt6
58+
run: cmake --build --preset dev-clazy
10559

10660
- name: Test
107-
run: ctest --preset dev-clazy-qt6
61+
run: ctest --preset dev-clazy
10862

10963
archlinux-clang-tidy:
11064
needs: pre_job
@@ -120,14 +74,14 @@ jobs:
12074
submodules: recursive
12175

12276
- name: Configure
123-
run: cmake --preset dev-clazy-qt6
77+
run: cmake --preset dev-clazy
12478

12579
- name: Analyze
12680
# the first lines ensures all moc generated headers are available
127-
run: cd build-dev-clazy-qt6 &&
81+
run: cd build-dev-clazy &&
12882
ninja -t targets all | grep "mocs_compilation.cpp:" | cut -f1 -d':' | xargs ninja &&
12983
cd .. &&
130-
./scripts/run_clang_tidy.sh build-dev-clazy-qt6 &&
84+
./scripts/run_clang_tidy.sh build-dev-clazy &&
13185
[ ! -s scripts/fixits/fixits.yaml ]
13286

13387
- name: Upload Fixits
@@ -151,13 +105,13 @@ jobs:
151105
submodules: recursive
152106

153107
- name: Configure
154-
run: cmake --preset dev-asan-qt6 -DCMAKE_CXX_FLAGS_INIT=-Werror -DCMAKE_C_FLAGS_INIT=-Werror
108+
run: cmake --preset dev-asan -DCMAKE_CXX_FLAGS_INIT=-Werror -DCMAKE_C_FLAGS_INIT=-Werror
155109

156110
- name: Build
157-
run: cmake --build --preset dev-asan-qt6
111+
run: cmake --build --preset dev-asan
158112

159113
- name: Test
160-
run: ctest --preset dev-asan-qt6
114+
run: ctest --preset dev-asan
161115

162116
fedora42:
163117
needs: pre_job
@@ -173,13 +127,13 @@ jobs:
173127
submodules: recursive
174128

175129
- name: Configure
176-
run: cmake --preset dev-asan-qt6 -DCMAKE_CXX_FLAGS_INIT=-Werror -DCMAKE_C_FLAGS_INIT=-Werror
130+
run: cmake --preset dev-asan -DCMAKE_CXX_FLAGS_INIT=-Werror -DCMAKE_C_FLAGS_INIT=-Werror
177131

178132
- name: Build
179-
run: cmake --build --preset dev-asan-qt6
133+
run: cmake --build --preset dev-asan
180134

181135
- name: Test
182-
run: ctest --preset dev-asan-qt6
136+
run: ctest --preset dev-asan
183137

184138
opensuse-tumbleweed:
185139
needs: pre_job
@@ -195,15 +149,15 @@ jobs:
195149
submodules: recursive
196150

197151
- name: Configure
198-
run: cmake --preset dev-asan-qt6 -DCMAKE_CXX_FLAGS_INIT=-Werror -DCMAKE_C_FLAGS_INIT=-Werror
152+
run: cmake --preset dev-asan -DCMAKE_CXX_FLAGS_INIT=-Werror -DCMAKE_C_FLAGS_INIT=-Werror
199153

200154
- name: Build
201-
run: cmake --build --preset dev-asan-qt6
155+
run: cmake --build --preset dev-asan
202156

203157
- name: Test
204-
run: ctest --preset dev-asan-qt6
158+
run: ctest --preset dev-asan
205159

206-
neon-qt6:
160+
neon:
207161
needs: pre_job
208162
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
209163

@@ -217,10 +171,10 @@ jobs:
217171
submodules: recursive
218172

219173
- name: Configure
220-
run: cmake --preset dev-asan-qt6 -DCMAKE_CXX_FLAGS_INIT=-Werror -DCMAKE_C_FLAGS_INIT=-Werror
174+
run: cmake --preset dev-asan -DCMAKE_CXX_FLAGS_INIT=-Werror -DCMAKE_C_FLAGS_INIT=-Werror
221175

222176
- name: Build
223-
run: cmake --build --preset dev-asan-qt6
177+
run: cmake --build --preset dev-asan
224178

225179
- name: Test
226-
run: ctest --preset dev-asan-qt6
180+
run: ctest --preset dev-asan

‎CMakeLists.txt‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ set(CMAKE_CXX_STANDARD 17)
2727
set(CMAKE_CXX_STANDARD_REQUIRED ON)
2828

2929
option(APPIMAGE_BUILD "configure build for bundling in an appimage" OFF)
30-
option(QT6_BUILD "configure build to use Qt6/KF6" OFF)
3130

3231
# Enable the test harness
3332
enable_testing()
@@ -38,15 +37,9 @@ set(HOTSPOT_VERSION_STRING "${hotspot_VERSION}")
3837
include(HotspotMacrosInternal)
3938
include(FeatureSummary)
4039

41-
if(QT6_BUILD)
42-
set(QT_MAJOR_VERSION 6)
43-
set(QT_MIN_VERSION 6.4)
44-
set(KDDW_SUFFIX "-qt6")
45-
else()
46-
set(QT_MAJOR_VERSION 5)
47-
set(QT_MIN_VERSION 5.15)
48-
set(KDDW_SUFFIX "")
49-
endif()
40+
set(QT_MAJOR_VERSION 6)
41+
set(QT_MIN_VERSION 6.4)
42+
set(KDDW_SUFFIX "-qt6")
5043

5144
find_package(
5245
Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION}

‎CMakePresets.json‎

Lines changed: 0 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,13 @@
1212
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
1313
}
1414
},
15-
{
16-
"name": "qt6",
17-
"cacheVariables": {
18-
"QT6_BUILD": "ON"
19-
}
20-
},
2115
{
2216
"name": "asan",
2317
"cacheVariables": {
2418
"CMAKE_CXX_FLAGS_DEBUG": "-g -fsanitize=address,undefined",
2519
"CMAKE_C_FLAGS_DEBUG": "-g -fsanitize=address,undefined"
2620
}
2721
},
28-
{
29-
"name": "dev-qt6",
30-
"displayName": "dev with Qt6",
31-
"description": "Preset for developers using Qt6",
32-
"inherits": [
33-
"dev",
34-
"qt6"
35-
]
36-
},
3722
{
3823
"name": "dev-asan",
3924
"displayName": "dev with sanitizers",
@@ -43,15 +28,6 @@
4328
"asan"
4429
]
4530
},
46-
{
47-
"name": "dev-asan-qt6",
48-
"displayName": "dev with sanitizers, Qt6",
49-
"description": "Preset for developers with Qt6, asan and ubsan enabled",
50-
"inherits": [
51-
"dev-asan",
52-
"qt6"
53-
]
54-
},
5531
{
5632
"name": "dev-clazy",
5733
"displayName": "clazy with sanitizers",
@@ -66,15 +42,6 @@
6642
"dev-asan"
6743
]
6844
},
69-
{
70-
"name": "dev-clazy-qt6",
71-
"displayName": "clazy with sanitizers, Qt6",
72-
"description": "Preset for compiling with clang/clazy, Qt6 and asan and ubsan enabled",
73-
"inherits": [
74-
"dev-clazy",
75-
"qt6"
76-
]
77-
},
7845
{
7946
"name": "dev-opt",
8047
"displayName": "dev with optimizations",
@@ -87,15 +54,6 @@
8754
"dev"
8855
]
8956
},
90-
{
91-
"name": "dev-opt-qt6",
92-
"displayName": "dev with Qt6, optimizations",
93-
"description": "Preset for developers with Qt6, compiler optimizations enabled",
94-
"inherits": [
95-
"dev-opt",
96-
"qt6"
97-
]
98-
},
9957
{
10058
"name": "dev-opt-asan",
10159
"displayName": "dev with optimizations and sanitizers",
@@ -104,57 +62,28 @@
10462
"dev-opt",
10563
"asan"
10664
]
107-
},
108-
{
109-
"name": "dev-opt-asan-qt6",
110-
"displayName": "dev with optimizations, Qt6 and sanitizers",
111-
"description": "Preset for developers with Qt6, compiler optimizations and sanitizers enabled",
112-
"inherits": [
113-
"dev-opt-asan",
114-
"qt6"
115-
]
11665
}
11766
],
11867
"buildPresets": [
11968
{
12069
"name": "dev",
12170
"configurePreset": "dev"
12271
},
123-
{
124-
"name": "dev-qt6",
125-
"configurePreset": "dev-qt6"
126-
},
12772
{
12873
"name": "dev-asan",
12974
"configurePreset": "dev-asan"
13075
},
131-
{
132-
"name": "dev-asan-qt6",
133-
"configurePreset": "dev-asan-qt6"
134-
},
13576
{
13677
"name": "dev-opt",
13778
"configurePreset": "dev-opt"
13879
},
139-
{
140-
"name": "dev-opt-qt6",
141-
"configurePreset": "dev-opt-qt6"
142-
},
14380
{
14481
"name": "dev-opt-asan",
14582
"configurePreset": "dev-opt-asan"
14683
},
147-
{
148-
"name": "dev-opt-asan-qt6",
149-
"configurePreset": "dev-opt-asan-qt6"
150-
},
15184
{
15285
"name": "dev-clazy",
15386
"configurePreset": "dev-clazy"
154-
},
155-
{
156-
"name": "dev-clazy-qt6",
157-
"configurePreset": "dev-clazy-qt6"
15887
}
15988
],
16089
"testPresets": [
@@ -188,31 +117,6 @@
188117
"name": "dev-clazy",
189118
"configurePreset": "dev-clazy",
190119
"inherits": "base"
191-
},
192-
{
193-
"name": "dev-qt6",
194-
"configurePreset": "dev-qt6",
195-
"inherits": "base"
196-
},
197-
{
198-
"name": "dev-asan-qt6",
199-
"configurePreset": "dev-asan-qt6",
200-
"inherits": "base"
201-
},
202-
{
203-
"name": "dev-opt-qt6",
204-
"configurePreset": "dev-opt-qt6",
205-
"inherits": "base"
206-
},
207-
{
208-
"name": "dev-opt-asan-qt6",
209-
"configurePreset": "dev-opt-asan-qt6",
210-
"inherits": "base"
211-
},
212-
{
213-
"name": "dev-clazy-qt6",
214-
"configurePreset": "dev-clazy-qt6",
215-
"inherits": "base"
216120
}
217121
]
218122
}

0 commit comments

Comments
 (0)