From aa38d3dfb16e76e8e2ce2d270020a6cb5cc8d3e9 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 23 Nov 2014 07:30:21 -0800 Subject: [PATCH] Disable warning about QObject::event being hidden Found by Clang 3.6: qdeclarativemediametadata_p.h:292:14: warning: 'QDeclarativeMediaMetaData::event' hides overloaded virtual function [-Woverloaded-virtual] qobject.h:116:18: note: hidden overloaded virtual function 'QObject::event' declared here: different number of parameters (1 vs 0) Change-Id: I4324c984649738c9625cc3eb9dddea6e2abf46a9 Reviewed-by: Yoann Lopes --- src/imports/multimedia/qdeclarativemediametadata_p.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/imports/multimedia/qdeclarativemediametadata_p.h b/src/imports/multimedia/qdeclarativemediametadata_p.h index 8421d8a4..ce704262 100644 --- a/src/imports/multimedia/qdeclarativemediametadata_p.h +++ b/src/imports/multimedia/qdeclarativemediametadata_p.h @@ -289,7 +289,13 @@ public: setMetaData(QMediaMetaData::CameraManufacturer, manufacturer); } QVariant cameraModel() const { return m_mediaObject->metaData(QMediaMetaData::CameraModel); } void setCameraModel(const QVariant &model) { setMetaData(QMediaMetaData::CameraModel, model); } + +QT_WARNING_PUSH +QT_WARNING_DISABLE_GCC("-Woverloaded-virtual") +QT_WARNING_DISABLE_CLANG("-Woverloaded-virtual") QVariant event() const { return m_mediaObject->metaData(QMediaMetaData::Event); } +QT_WARNING_POP + void setEvent(const QVariant &event) { setMetaData(QMediaMetaData::Event, event); } QVariant subject() const { return m_mediaObject->metaData(QMediaMetaData::Subject); } void setSubject(const QVariant &subject) { setMetaData(QMediaMetaData::Subject, subject); }