Skip to content

Commit 7707aac

Browse files
committed
Drop support for Qt 5
This is a soft removal from the build system. Qt 5 has reached its end- of-support. It is not a thorough removal so for a little while longer a distro could easily patch it back in.
1 parent 1a339c5 commit 7707aac

File tree

4 files changed

+4
-27
lines changed

4 files changed

+4
-27
lines changed

CMakeLists.txt

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ option(MOD_AVFORMAT "Enable avformat module" ON)
1818
option(MOD_DECKLINK "Enable DeckLink module" ON)
1919
option(MOD_FREI0R "Enable Frei0r module" ON)
2020
option(MOD_GDK "Enable GDK module" ON)
21-
option(MOD_GLAXNIMATE "Enable Glaxnimate module (Qt5)" OFF)
2221
option(MOD_GLAXNIMATE_QT6 "Enable Glaxnimate module (Qt6)" OFF)
2322
option(MOD_JACKRACK "Enable JACK Rack module" ON)
2423
option(USE_LV2 "Enable LV2 features" ON)
@@ -31,7 +30,6 @@ option(MOD_OPENCV "Enable OpenCV module" OFF)
3130
option(MOD_MOVIT "Enable OpenGL module" ON)
3231
option(MOD_PLUS "Enable Plus module" ON)
3332
option(MOD_PLUSGPL "Enable PlusGPL module (GPL)" ON)
34-
option(MOD_QT "Enable Qt5 module (GPL)" OFF)
3533
option(MOD_QT6 "Enable Qt6 module (GPL)" ON)
3634
option(MOD_RESAMPLE "Enable Resample module (GPL)" ON)
3735
option(MOD_RTAUDIO "Enable RtAudio module" ON)
@@ -175,7 +173,6 @@ endif()
175173
if(NOT GPL)
176174
set(MOD_NORMALIZE OFF)
177175
set(MOD_PLUSGPL OFF)
178-
set(MOD_QT OFF)
179176
set(MOD_QT6 OFF)
180177
set(MOD_RESAMPLE OFF)
181178
set(MOD_RUBBERBAND OFF)
@@ -202,11 +199,11 @@ endif()
202199

203200
find_package(SDL2)
204201

205-
if(MOD_QT OR MOD_QT6 OR MOD_PLUS)
202+
if(MOD_QT6 OR MOD_PLUS)
206203
find_package(FFTW3)
207204
endif()
208205

209-
if(MOD_QT OR MOD_QT6 OR MOD_GDK)
206+
if(MOD_QT6 OR MOD_GDK)
210207
pkg_check_modules(libexif IMPORTED_TARGET libexif)
211208
endif()
212209

@@ -331,16 +328,6 @@ if(BUILD_TESTING)
331328
enable_testing()
332329
endif()
333330

334-
if(MOD_QT)
335-
find_package(Qt5 REQUIRED COMPONENTS Core Xml Gui Svg Widgets)
336-
list(APPEND MLT_SUPPORTED_COMPONENTS qt)
337-
endif()
338-
339-
if(MOD_GLAXNIMATE)
340-
find_package(Qt5 REQUIRED COMPONENTS Core Gui Network Widgets Xml)
341-
list(APPEND MLT_SUPPORTED_COMPONENTS glaxnimate)
342-
endif()
343-
344331
if(MOD_RESAMPLE)
345332
pkg_check_modules(samplerate REQUIRED IMPORTED_TARGET samplerate)
346333
list(APPEND MLT_SUPPORTED_COMPONENTS resample)
@@ -558,7 +545,6 @@ add_feature_info("Module: avformat" MOD_AVFORMAT "")
558545
add_feature_info("Module: DeckLink" MOD_DECKLINK "")
559546
add_feature_info("Module: Frei0r" MOD_FREI0R "")
560547
add_feature_info("Module: GDK" MOD_GDK "")
561-
add_feature_info("Module: Glaxnimate (Qt5)" MOD_GLAXNIMATE "")
562548
add_feature_info("Module: Glaxnimate (Qt6)" MOD_GLAXNIMATE_QT6 "")
563549
add_feature_info("Module: JACKRack" MOD_JACKRACK "")
564550
add_feature_info("Module: Kdenlive" MOD_KDENLIVE "")
@@ -569,7 +555,6 @@ add_feature_info("Module: OpenCV" MOD_OPENCV "")
569555
add_feature_info("Module: Movit" MOD_MOVIT "")
570556
add_feature_info("Module: Plus" MOD_PLUS "")
571557
add_feature_info("Module: PlusGPL" MOD_PLUSGPL "")
572-
add_feature_info("Module: Qt (Qt5)" MOD_QT "")
573558
add_feature_info("Module: Qt6" MOD_QT6 "")
574559
add_feature_info("Module: Resample" MOD_RESAMPLE "")
575560
add_feature_info("Module: RtAudio" MOD_RTAUDIO "")

src/modules/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if(MOD_GDK)
1616
add_subdirectory(gdk)
1717
endif()
1818

19-
if(MOD_GLAXNIMATE OR MOD_GLAXNIMATE_QT6)
19+
if(MOD_GLAXNIMATE_QT6)
2020
add_subdirectory(glaxnimate)
2121
endif()
2222

@@ -56,7 +56,7 @@ if(MOD_PLUSGPL)
5656
add_subdirectory(plusgpl)
5757
endif()
5858

59-
if(MOD_QT OR MOD_QT6)
59+
if(MOD_QT6)
6060
add_subdirectory(qt)
6161
endif()
6262

src/modules/glaxnimate/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,6 @@ function(mlt_add_glaxnimate_module ARG_TARGET)
213213
)
214214
endfunction()
215215

216-
if(MOD_GLAXNIMATE)
217-
mlt_add_glaxnimate_module(mltglaxnimate QT_VERSION 5 DATADIR glaxnimate)
218-
endif()
219-
220216
if(MOD_GLAXNIMATE_QT6)
221217
mlt_add_glaxnimate_module(mltglaxnimate-qt6 QT_VERSION 6 DATADIR glaxnimate-qt6)
222218
endif()

src/modules/qt/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,6 @@ function(mlt_add_qt_module ARG_TARGET)
125125
)
126126
endfunction()
127127

128-
if (MOD_QT)
129-
mlt_add_qt_module(mltqt QT_VERSION 5 DATADIR qt)
130-
endif()
131-
132128
if (MOD_QT6)
133129
mlt_add_qt_module(mltqt6 QT_VERSION 6 DATADIR qt6)
134130
endif()

0 commit comments

Comments
 (0)