Skip to content

Commit 37b0d31

Browse files
committed
[commontk] Fix Qt 5.15 failing to use 5.15 wrappers
PythonQt_QtBindings.cpp and PythonQt_QtBindings.h were copied over from the generated_cpp_511 directory.
1 parent 93c546e commit 37b0d31

File tree

3 files changed

+85
-0
lines changed

3 files changed

+85
-0
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@ set(generated_cpp_suffix_51 _50)
177177
set(generated_cpp_suffix "_${QT_VERSION_MAJOR}${QT_VERSION_MINOR}")
178178
if(DEFINED generated_cpp_suffix_${QT_VERSION_MAJOR}${QT_VERSION_MINOR})
179179
set(generated_cpp_suffix "${generated_cpp_suffix_${QT_VERSION_MAJOR}${QT_VERSION_MINOR}}")
180+
elseif("${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}" VERSION_GREATER "5.14")
181+
set(generated_cpp_suffix "_515")
180182
elseif("${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}" VERSION_GREATER "5.10")
181183
set(generated_cpp_suffix "_511")
182184
elseif("${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}" VERSION_GREATER "5.5")
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
2+
#include "PythonQt_QtBindings.h"
3+
4+
#include "PythonQt.h"
5+
6+
void PythonQt_init_QtGui(PyObject*);
7+
void PythonQt_init_QtSvg(PyObject*);
8+
void PythonQt_init_QtSql(PyObject*);
9+
void PythonQt_init_QtNetwork(PyObject*);
10+
void PythonQt_init_QtCore(PyObject*);
11+
void PythonQt_init_QtWebKit(PyObject*);
12+
void PythonQt_init_QtOpenGL(PyObject*);
13+
void PythonQt_init_QtQml(PyObject*);
14+
void PythonQt_init_QtQuick(PyObject*);
15+
void PythonQt_init_QtXml(PyObject*);
16+
void PythonQt_init_QtXmlPatterns(PyObject*);
17+
void PythonQt_init_QtUiTools(PyObject*);
18+
void PythonQt_init_QtMultimedia(PyObject*);
19+
20+
PYTHONQT_EXPORT void PythonQt_init_QtBindings()
21+
{
22+
#ifdef PYTHONQT_WRAP_Qtcore
23+
PythonQt_init_QtCore(0);
24+
#endif
25+
26+
#ifdef PYTHONQT_WRAP_Qtgui
27+
PythonQt_init_QtGui(0);
28+
#endif
29+
30+
#ifdef PYTHONQT_WRAP_Qtnetwork
31+
PythonQt_init_QtNetwork(0);
32+
#endif
33+
34+
#ifdef PYTHONQT_WRAP_Qtopengl
35+
PythonQt_init_QtOpenGL(0);
36+
#endif
37+
38+
#ifdef PYTHONQT_WRAP_Qtqml
39+
PythonQt_init_QtQml(0);
40+
#endif
41+
42+
#ifdef PYTHONQT_WRAP_Qtquick
43+
PythonQt_init_QtQuick(0);
44+
#endif
45+
46+
#ifdef PYTHONQT_WRAP_Qtsql
47+
PythonQt_init_QtSql(0);
48+
#endif
49+
50+
#ifdef PYTHONQT_WRAP_Qtsvg
51+
PythonQt_init_QtSvg(0);
52+
#endif
53+
54+
#ifdef PYTHONQT_WRAP_Qtuitools
55+
PythonQt_init_QtUiTools(0);
56+
#endif
57+
58+
#ifdef PYTHONQT_WRAP_Qtmultimedia
59+
PythonQt_init_QtMultimedia(0);
60+
#endif
61+
62+
#ifdef PYTHONQT_WRAP_Qtwebkit
63+
PythonQt_init_QtWebKit(0);
64+
#endif
65+
66+
#ifdef PYTHONQT_WRAP_Qtxml
67+
PythonQt_init_QtXml(0);
68+
#endif
69+
70+
#ifdef PYTHONQT_WRAP_Qtxmlpatterns
71+
PythonQt_init_QtXmlPatterns(0);
72+
#endif
73+
};
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#ifndef _PYTHONQT_QTBINDINGS_H
2+
#define _PYTHONQT_QTBINDINGS_H
3+
4+
#include "PythonQtSystem.h"
5+
6+
/// Initialize Qt bindings enabled at configuration time
7+
PYTHONQT_EXPORT void PythonQt_init_QtBindings();
8+
9+
#endif
10+

0 commit comments

Comments
 (0)