diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-11 07:47:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-11 07:47:21 +0200 |
| commit | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (patch) | |
| tree | 7ca5d4ba83888bb5ad4d9b0141e5c62f8a5138f2 /src/corelib/kernel/qmetaobject.cpp | |
| parent | 235ac95520a0fc2c822dedce7358e3c64a764255 (diff) | |
| parent | 63e88f60a769f2535945db0e1cabb9815ff45a77 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/widgets/styles/qstyle_p.h
Change-Id: I0e6e856bd6628da1135b3ba674dddffabbeb5c09
Diffstat (limited to 'src/corelib/kernel/qmetaobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 3bcad8cf32..56217262f2 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -235,6 +235,12 @@ QObject *QMetaObject::newInstance(QGenericArgument val0, QGenericArgument val8, QGenericArgument val9) const { + if (!inherits(&QObject::staticMetaObject)) + { + qWarning("QMetaObject::newInstance: type %s does not inherit QObject", className()); + return nullptr; + } + QByteArray constructorName = className(); { int idx = constructorName.lastIndexOf(':'); |