diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-01 10:26:36 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-01 10:26:36 +0100 |
| commit | c043ebebaba80b32ddb69ed29aa3408549567a6d (patch) | |
| tree | fb23afdccd8fd566d973ff3b3f95f30e8b24845e /src | |
| parent | 38d0c7d930ce986e1406ce24894de4e4bced5387 (diff) | |
| parent | be2cb77f0c882444d4d1080953b4d1b961973c0a (diff) | |
Merge remote-tracking branch 'origin/5.10' into devv5.11.0-alpha1
Conflicts:
.qmake.conf
src/scxml/qscxmlcompiler.cpp
Change-Id: Ie338e2c6a09e2d885d5f57a80abd386065ac8bc8
Diffstat (limited to 'src')
| -rw-r--r-- | src/scxml/qscxmlcompiler.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/scxml/qscxmlcompiler.cpp b/src/scxml/qscxmlcompiler.cpp index cc89ad1..61ad030 100644 --- a/src/scxml/qscxmlcompiler.cpp +++ b/src/scxml/qscxmlcompiler.cpp @@ -496,8 +496,6 @@ class DynamicStateMachine: public QScxmlStateMachine, public QScxmlInternal::Gen Q_DECLARE_PRIVATE(DynamicStateMachine) // Manually expanded from Q_OBJECT macro: public: - Q_OBJECT_CHECK - const QMetaObject *metaObject() const override { return d_func()->m_metaObject; } |