Skip to content

Commit 0580304

Browse files
committed
Re-introduce support for QMatrix when building against Qt < 6.0
This partially reverts 10a3e49 ("Qt6 compatibility fixes for core PythonQt library", 2023-08-21)
1 parent d3a3f23 commit 0580304

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

Diff for: src/PythonQt.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,9 @@ void PythonQt::init(int flags, const QByteArray& pythonQtModuleName)
260260
PythonQtRegisterToolClassesTemplateConverterForKnownClass(QPen);
261261
PythonQtRegisterToolClassesTemplateConverterForKnownClass(QTextLength);
262262
PythonQtRegisterToolClassesTemplateConverterForKnownClass(QTextFormat);
263+
#if QT_VERSION < 0x060000
264+
PythonQtRegisterToolClassesTemplateConverterForKnownClass(QMatrix);
265+
#endif
263266

264267
PyObject* pack = PythonQt::priv()->packageByName("QtCore");
265268
PyObject* pack2 = PythonQt::priv()->packageByName("Qt");

Diff for: src/PythonQtVariants.h

+3
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@
7272
#include <QPen>
7373
#include <QTextLength>
7474
#include <QTextFormat>
75+
#if QT_VERSION < 0x060000
76+
#include <QMatrix>
77+
#endif
7578

7679
#endif
7780

0 commit comments

Comments
 (0)