Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Qt multimedia component from PythonQt #992

Merged
merged 1 commit into from
Sep 24, 2021
Merged

Added Qt multimedia component from PythonQt #992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMake/ctkMacroSetupQt.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ macro(ctkMacroSetupQt)
if(CTK_QT_VERSION VERSION_GREATER "4")
cmake_minimum_required(VERSION 2.8.12)
find_package(Qt5 COMPONENTS Core)
set(CTK_QT5_COMPONENTS Core Xml XmlPatterns Concurrent Sql Test)
set(CTK_QT5_COMPONENTS Core Xml XmlPatterns Concurrent Sql Test Multimedia)
if(CTK_ENABLE_Widgets OR CTK_LIB_Widgets OR CTK_LIB_CommandLineModules/Frontend/QtGui OR CTK_BUILD_ALL OR CTK_BUILD_ALL_LIBRARIES)
list(APPEND CTK_QT5_COMPONENTS Widgets OpenGL UiTools)
endif()
Expand Down
4 changes: 2 additions & 2 deletions CMakeExternals/PythonQt.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR)
list(APPEND proj_DEPENDENCIES VTK)
endif()

set(qtlibs core gui network opengl sql svg uitools xml)
set(qtlibs core gui multimedia network opengl sql svg uitools xml)

# Enable Qt libraries PythonQt wrapping if required
if(CTK_QT_VERSION VERSION_GREATER "4")
Expand Down Expand Up @@ -82,7 +82,7 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR)
ctkFunctionExtractOptimizedLibrary(PYTHON_LIBRARIES PYTHON_LIBRARY)

if (CTK_QT_VERSION VERSION_GREATER "4")
set(revision_tag c306140442feb6e76d4bae672c48cd7f11d9b0cd) # patched-9
set(revision_tag c4a5a155b2942d4b003862c3317105b4a1ea6755) # patched-9
else()
set(revision_tag 90c08fb0d523622d2de9e7a91f4ef116a66a8801) # patched-5
endif()
Expand Down
2 changes: 1 addition & 1 deletion Libs/Scripting/Python/Core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ set(KIT_resources
#
# Configure file describing which Qt modules are wrapped
#
set(QT_PYTHON_WRAPPED_LIBRARIES_LIST Core Gui Widgets Network OpenGL Sql Svg UiTools WebKit WebKitWidgets Xml XmlPatterns)
set(QT_PYTHON_WRAPPED_LIBRARIES_LIST Core Gui Widgets Multimedia Network OpenGL Sql Svg UiTools WebKit WebKitWidgets Xml XmlPatterns)
foreach(qtlib ${QT_PYTHON_WRAPPED_LIBRARIES_LIST})
string(TOUPPER ${qtlib} qtlib)
set(CTK_PYTHONQT_WRAP_QT${qtlib} ${CTK_LIB_Scripting/Python/Core_PYTHONQT_WRAP_QT${qtlib}})
Expand Down
1 change: 1 addition & 0 deletions Libs/Scripting/Python/Core/ctkScriptingPythonCoreConfigure.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#cmakedefine CTK_PYTHONQT_WRAP_QTCORE
#cmakedefine CTK_PYTHONQT_WRAP_QTGUI
#cmakedefine CTK_PYTHONQT_WRAP_QTWIDGETS
#cmakedefine CTK_PYTHONQT_WRAP_QTMULTIMEDIA
#cmakedefine CTK_PYTHONQT_WRAP_QTNETWORK
#cmakedefine CTK_PYTHONQT_WRAP_QTOPENGL
#cmakedefine CTK_PYTHONQT_WRAP_QTPRINTSUPPORT
Expand Down
1 change: 1 addition & 0 deletions Libs/Scripting/Python/Core/ctk_library_options.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ set(ctk_library_options
PYTHONQT_WRAP_QTCORE:OFF
PYTHONQT_WRAP_QTGUI:OFF
PYTHONQT_WRAP_QTWIDGETS:OFF
PYTHONQT_WRAP_QTMULTIMEDIA:OFF
PYTHONQT_WRAP_QTNETWORK:OFF
PYTHONQT_WRAP_QTOPENGL:OFF
PYTHONQT_WRAP_QTPRINTSUPPORT:OFF
Expand Down