Skip to content

Commit ec9fcee

Browse files
authored
ENH: Add Python wrapping for Qt multimedia component (#992)
Co-authored-by: Sylvain Bernhardt <[email protected]>
1 parent 34a390a commit ec9fcee

File tree

5 files changed

+6
-4
lines changed

5 files changed

+6
-4
lines changed

CMake/ctkMacroSetupQt.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ macro(ctkMacroSetupQt)
3333
if(CTK_QT_VERSION VERSION_GREATER "4")
3434
cmake_minimum_required(VERSION 2.8.12)
3535
find_package(Qt5 COMPONENTS Core)
36-
set(CTK_QT5_COMPONENTS Core Xml XmlPatterns Concurrent Sql Test)
36+
set(CTK_QT5_COMPONENTS Core Xml XmlPatterns Concurrent Sql Test Multimedia)
3737
if(CTK_ENABLE_Widgets OR CTK_LIB_Widgets OR CTK_LIB_CommandLineModules/Frontend/QtGui OR CTK_BUILD_ALL OR CTK_BUILD_ALL_LIBRARIES)
3838
list(APPEND CTK_QT5_COMPONENTS Widgets OpenGL UiTools)
3939
endif()

CMakeExternals/PythonQt.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR)
3131
list(APPEND proj_DEPENDENCIES VTK)
3232
endif()
3333

34-
set(qtlibs core gui network opengl sql svg uitools xml)
34+
set(qtlibs core gui multimedia network opengl sql svg uitools xml)
3535

3636
# Enable Qt libraries PythonQt wrapping if required
3737
if(CTK_QT_VERSION VERSION_GREATER "4")
@@ -82,7 +82,7 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR)
8282
ctkFunctionExtractOptimizedLibrary(PYTHON_LIBRARIES PYTHON_LIBRARY)
8383

8484
if (CTK_QT_VERSION VERSION_GREATER "4")
85-
set(revision_tag c306140442feb6e76d4bae672c48cd7f11d9b0cd) # patched-9
85+
set(revision_tag c4a5a155b2942d4b003862c3317105b4a1ea6755) # patched-9
8686
else()
8787
set(revision_tag 90c08fb0d523622d2de9e7a91f4ef116a66a8801) # patched-5
8888
endif()

Libs/Scripting/Python/Core/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ set(KIT_resources
2828
#
2929
# Configure file describing which Qt modules are wrapped
3030
#
31-
set(QT_PYTHON_WRAPPED_LIBRARIES_LIST Core Gui Widgets Network OpenGL Sql Svg UiTools WebKit WebKitWidgets Xml XmlPatterns)
31+
set(QT_PYTHON_WRAPPED_LIBRARIES_LIST Core Gui Widgets Multimedia Network OpenGL Sql Svg UiTools WebKit WebKitWidgets Xml XmlPatterns)
3232
foreach(qtlib ${QT_PYTHON_WRAPPED_LIBRARIES_LIST})
3333
string(TOUPPER ${qtlib} qtlib)
3434
set(CTK_PYTHONQT_WRAP_QT${qtlib} ${CTK_LIB_Scripting/Python/Core_PYTHONQT_WRAP_QT${qtlib}})

Libs/Scripting/Python/Core/ctkScriptingPythonCoreConfigure.h.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#cmakedefine CTK_PYTHONQT_WRAP_QTCORE
1111
#cmakedefine CTK_PYTHONQT_WRAP_QTGUI
1212
#cmakedefine CTK_PYTHONQT_WRAP_QTWIDGETS
13+
#cmakedefine CTK_PYTHONQT_WRAP_QTMULTIMEDIA
1314
#cmakedefine CTK_PYTHONQT_WRAP_QTNETWORK
1415
#cmakedefine CTK_PYTHONQT_WRAP_QTOPENGL
1516
#cmakedefine CTK_PYTHONQT_WRAP_QTPRINTSUPPORT

Libs/Scripting/Python/Core/ctk_library_options.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ set(ctk_library_options
1111
PYTHONQT_WRAP_QTCORE:OFF
1212
PYTHONQT_WRAP_QTGUI:OFF
1313
PYTHONQT_WRAP_QTWIDGETS:OFF
14+
PYTHONQT_WRAP_QTMULTIMEDIA:OFF
1415
PYTHONQT_WRAP_QTNETWORK:OFF
1516
PYTHONQT_WRAP_QTOPENGL:OFF
1617
PYTHONQT_WRAP_QTPRINTSUPPORT:OFF

0 commit comments

Comments
 (0)