mirror of https://github.com/qt/qtactiveqt.git
Merge tag 'v5.15.16-lts' into tqtc/lts-5.15-opensource
Qt 5.15.16-lts release Change-Id: Ib08800a75a0092ecf371997291ec681a525d0dd0
This commit is contained in:
commit
57ffe4b2b8
|
@ -2,4 +2,4 @@ load(qt_build_config)
|
|||
|
||||
DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
|
||||
|
||||
MODULE_VERSION = 5.15.15
|
||||
MODULE_VERSION = 5.15.16
|
||||
|
|
|
@ -3013,6 +3013,7 @@ int MetaObjectGenerator::aggregateParameterCount(const QMap<QByteArray, Method>
|
|||
|
||||
QMetaObject *MetaObjectGenerator::metaObject(const QMetaObject *parentObject, const QByteArray &className)
|
||||
{
|
||||
QSignalBlocker blockSignals(that ? that->qObject() : nullptr);
|
||||
if (that) {
|
||||
readClassInfo();
|
||||
if (typelib) {
|
||||
|
|
Loading…
Reference in New Issue