diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2016-04-08 12:27:24 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2016-04-08 11:09:20 +0000 |
| commit | 49fdb74757e5d9eb9333c10f1b756eed119bbb67 (patch) | |
| tree | fb62f30dc5627a2507c4727d91c427b37c2dc1ac /src/qml/qml/qqmlvmemetaobject_p.h | |
| parent | 1aa83ca46cf1ffebc5a486a0185dcf6313bca26b (diff) | |
QML: fix inconsistent use of Q_DECL_OVERRIDE.
Real compilers now complain:
In file included from /Users/erik/dev/qt5-dev/qtdeclarative/src/qml/qml/qqmlvme.cpp:57:
/Users/erik/dev/qt5-dev/qtdeclarative/src/qml/qml/qqmlvmemetaobject_p.h:174:17: warning: 'metaCall' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
virtual int metaCall(QObject *o, QMetaObject::Call c, int id, void **a);
^
/Users/erik/dev/builds/qt5-dev-debug/qtbase/include/QtCore/5.8.0/QtCore/private/../../../../../../../../qt5-dev/qtbase/src/corelib/kernel/qobject_p.h:428:17: note: overridden virtual function is here
virtual int metaCall(QObject *, QMetaObject::Call c, int _id, void **a) Q_DECL_OVERRIDE
^
Change-Id: I1a1a9a210696c19f94f76eaf33adf93a10c86442
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlvmemetaobject_p.h')
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h index c95cb7e070..fcdac3cc53 100644 --- a/src/qml/qml/qqmlvmemetaobject_p.h +++ b/src/qml/qml/qqmlvmemetaobject_p.h @@ -171,7 +171,7 @@ public: QQmlPropertyCache *propertyCache() const { return cache; } protected: - virtual int metaCall(QObject *o, QMetaObject::Call c, int id, void **a); + int metaCall(QObject *o, QMetaObject::Call c, int id, void **a) Q_DECL_OVERRIDE; bool intercept(QMetaObject::Call c, int id, void **a); public: |