Skip to content

Commit 16dcbc2

Browse files
committed
Adding Qt multimedia component to CMakeLists and to the bindings.
The corresponding wrapper is already present but depends on MultimediaWidgets, so this dependency has been updated in the CMakeLists too.
1 parent c306140 commit 16dcbc2

File tree

6 files changed

+28
-1
lines changed

6 files changed

+28
-1
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ set(qtlibs
3232
OpenGL
3333
Sql
3434
Svg
35+
Multimedia
3536
UiTools
3637
Xml
3738
XmlPatterns
@@ -142,7 +143,7 @@ endif()
142143
list(REMOVE_DUPLICATES qt_required_components)
143144

144145
message(STATUS "${PROJECT_NAME}: Required Qt components [${qt_required_components}]")
145-
find_package(Qt5 ${minimum_required_qt_version} COMPONENTS ${qt_required_components} REQUIRED)
146+
find_package(Qt5 ${minimum_required_qt_version} COMPONENTS ${qt_required_components} MultimediaWidgets REQUIRED)
146147

147148
set(QT_LIBRARIES )
148149
foreach(qtlib ${qt_required_components})
@@ -320,6 +321,7 @@ target_compile_options(PythonQt PRIVATE
320321
target_link_libraries(PythonQt
321322
${PYTHON_LIBRARY}
322323
${QT_LIBRARIES}
324+
Qt5::MultimediaWidgets
323325
)
324326

325327
#-----------------------------------------------------------------------------

generated_cpp_50/PythonQt_QtBindings.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ void PythonQt_init_QtOpenGL(PyObject*);
1313
void PythonQt_init_QtXml(PyObject*);
1414
void PythonQt_init_QtXmlPatterns(PyObject*);
1515
void PythonQt_init_QtUiTools(PyObject*);
16+
void PythonQt_init_QtMultimedia(PyObject*);
1617

1718
PYTHONQT_EXPORT void PythonQt_init_QtBindings()
1819
{
@@ -43,6 +44,10 @@ PYTHONQT_EXPORT void PythonQt_init_QtBindings()
4344
#ifdef PYTHONQT_WRAP_Qtuitools
4445
PythonQt_init_QtUiTools(0);
4546
#endif
47+
48+
#ifdef PYTHONQT_WRAP_Qtmultimedia
49+
PythonQt_init_QtMultimedia(0);
50+
#endif
4651

4752
#ifdef PYTHONQT_WRAP_Qtwebkit
4853
PythonQt_init_QtWebKit(0);

generated_cpp_511/PythonQt_QtBindings.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ void PythonQt_init_QtQuick(PyObject*);
1515
void PythonQt_init_QtXml(PyObject*);
1616
void PythonQt_init_QtXmlPatterns(PyObject*);
1717
void PythonQt_init_QtUiTools(PyObject*);
18+
void PythonQt_init_QtMultimedia(PyObject*);
1819

1920
PYTHONQT_EXPORT void PythonQt_init_QtBindings()
2021
{
@@ -53,6 +54,10 @@ PYTHONQT_EXPORT void PythonQt_init_QtBindings()
5354
#ifdef PYTHONQT_WRAP_Qtuitools
5455
PythonQt_init_QtUiTools(0);
5556
#endif
57+
58+
#ifdef PYTHONQT_WRAP_Qtmultimedia
59+
PythonQt_init_QtMultimedia(0);
60+
#endif
5661

5762
#ifdef PYTHONQT_WRAP_Qtwebkit
5863
PythonQt_init_QtWebKit(0);

generated_cpp_53/PythonQt_QtBindings.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ void PythonQt_init_QtOpenGL(PyObject*);
1313
void PythonQt_init_QtXml(PyObject*);
1414
void PythonQt_init_QtXmlPatterns(PyObject*);
1515
void PythonQt_init_QtUiTools(PyObject*);
16+
void PythonQt_init_QtMultimedia(PyObject*);
1617

1718
PYTHONQT_EXPORT void PythonQt_init_QtBindings()
1819
{
@@ -43,6 +44,10 @@ PYTHONQT_EXPORT void PythonQt_init_QtBindings()
4344
#ifdef PYTHONQT_WRAP_Qtuitools
4445
PythonQt_init_QtUiTools(0);
4546
#endif
47+
48+
#ifdef PYTHONQT_WRAP_Qtmultimedia
49+
PythonQt_init_QtMultimedia(0);
50+
#endif
4651

4752
#ifdef PYTHONQT_WRAP_Qtwebkit
4853
PythonQt_init_QtWebKit(0);

generated_cpp_54/PythonQt_QtBindings.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ void PythonQt_init_QtOpenGL(PyObject*);
1313
void PythonQt_init_QtXml(PyObject*);
1414
void PythonQt_init_QtXmlPatterns(PyObject*);
1515
void PythonQt_init_QtUiTools(PyObject*);
16+
void PythonQt_init_QtMultimedia(PyObject*);
1617

1718
PYTHONQT_EXPORT void PythonQt_init_QtBindings()
1819
{
@@ -43,6 +44,10 @@ PYTHONQT_EXPORT void PythonQt_init_QtBindings()
4344
#ifdef PYTHONQT_WRAP_Qtuitools
4445
PythonQt_init_QtUiTools(0);
4546
#endif
47+
48+
#ifdef PYTHONQT_WRAP_Qtmultimedia
49+
PythonQt_init_QtMultimedia(0);
50+
#endif
4651

4752
#ifdef PYTHONQT_WRAP_Qtwebkit
4853
PythonQt_init_QtWebKit(0);

generated_cpp_56/PythonQt_QtBindings.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ void PythonQt_init_QtQuick(PyObject*);
1515
void PythonQt_init_QtXml(PyObject*);
1616
void PythonQt_init_QtXmlPatterns(PyObject*);
1717
void PythonQt_init_QtUiTools(PyObject*);
18+
void PythonQt_init_QtMultimedia(PyObject*);
1819

1920
PYTHONQT_EXPORT void PythonQt_init_QtBindings()
2021
{
@@ -53,6 +54,10 @@ PYTHONQT_EXPORT void PythonQt_init_QtBindings()
5354
#ifdef PYTHONQT_WRAP_Qtuitools
5455
PythonQt_init_QtUiTools(0);
5556
#endif
57+
58+
#ifdef PYTHONQT_WRAP_Qtmultimedia
59+
PythonQt_init_QtMultimedia(0);
60+
#endif
5661

5762
#ifdef PYTHONQT_WRAP_Qtwebkit
5863
PythonQt_init_QtWebKit(0);

0 commit comments

Comments
 (0)