code.ivysaur.me/miqt
1
0
Fork 0
mirror of https://github.com/mappu/miqt.git synced 2025-04-28 16:10:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

qt: rebuild (QObjectData_dynamicMetaObject handling for Qt 6.9)

Browse Source
This commit is contained in:
Rick Calixte 2025-04-10 19:46:01 -04:00
parent 9d72a3f601
commit 1c04e1a749
No known key found for this signature in database
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qt6/gen_qobject.cpp
View File

@ -36,7 +36,13 @@ void miqt_exec_callback_QObject_disconnectNotify(QObject*, intptr_t, QMetaMethod
} /* extern C */ } /* extern C */
#endif #endif
// This method's return type was changed from non-const to const in Qt 6.9
#if QT_VERSION >= QT_VERSION_CHECK(6,9,0)
const QMetaObject* QObjectData_dynamicMetaObject(const QObjectData* self) {
#else
QMetaObject* QObjectData_dynamicMetaObject(const QObjectData* self) { QMetaObject* QObjectData_dynamicMetaObject(const QObjectData* self) {
#endif
return self->dynamicMetaObject(); return self->dynamicMetaObject();
} }

10
qt6/gen_qobject.h
View File

@ -14,6 +14,11 @@
extern "C" { extern "C" {
#endif #endif
// Based on the macro from Qt (LGPL v3), see https://www.qt.io/qt-licensing
// Macro is trivial and used here under fair use
// Usage does not imply derivation
#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
#ifdef __cplusplus #ifdef __cplusplus
class QAnyStringView; class QAnyStringView;
class QBindingStorage; class QBindingStorage;
@ -48,7 +53,12 @@ typedef struct QTimerEvent QTimerEvent;
typedef struct QVariant QVariant; typedef struct QVariant QVariant;
#endif #endif
// This method's return type was changed from non-const to const in Qt 6.9
#if QT_VERSION >= QT_VERSION_CHECK(6,9,0)
const QMetaObject* QObjectData_dynamicMetaObject(const QObjectData* self);
#else
QMetaObject* QObjectData_dynamicMetaObject(const QObjectData* self); QMetaObject* QObjectData_dynamicMetaObject(const QObjectData* self);
#endif
void QObjectData_delete(QObjectData* self); void QObjectData_delete(QObjectData* self);
QObject* QObject_new(); QObject* QObject_new();