diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-11-23 07:30:21 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-12-03 22:29:20 +0100 |
| commit | aa38d3dfb16e76e8e2ce2d270020a6cb5cc8d3e9 (patch) | |
| tree | 889460dd37e580ce8c0fdc8a8502d0c2bf7cd27c /src/imports | |
| parent | 4bdf1561f46e85b14665b38804410340ffe1820b (diff) | |
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 <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/qdeclarativemediametadata_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/imports/multimedia/qdeclarativemediametadata_p.h b/src/imports/multimedia/qdeclarativemediametadata_p.h index 8421d8a49..ce7042622 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); } |