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>
This commit is contained in:
@@ -289,7 +289,13 @@ public:
|
|||||||
setMetaData(QMediaMetaData::CameraManufacturer, manufacturer); }
|
setMetaData(QMediaMetaData::CameraManufacturer, manufacturer); }
|
||||||
QVariant cameraModel() const { return m_mediaObject->metaData(QMediaMetaData::CameraModel); }
|
QVariant cameraModel() const { return m_mediaObject->metaData(QMediaMetaData::CameraModel); }
|
||||||
void setCameraModel(const QVariant &model) { setMetaData(QMediaMetaData::CameraModel, model); }
|
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); }
|
QVariant event() const { return m_mediaObject->metaData(QMediaMetaData::Event); }
|
||||||
|
QT_WARNING_POP
|
||||||
|
|
||||||
void setEvent(const QVariant &event) { setMetaData(QMediaMetaData::Event, event); }
|
void setEvent(const QVariant &event) { setMetaData(QMediaMetaData::Event, event); }
|
||||||
QVariant subject() const { return m_mediaObject->metaData(QMediaMetaData::Subject); }
|
QVariant subject() const { return m_mediaObject->metaData(QMediaMetaData::Subject); }
|
||||||
void setSubject(const QVariant &subject) { setMetaData(QMediaMetaData::Subject, subject); }
|
void setSubject(const QVariant &subject) { setMetaData(QMediaMetaData::Subject, subject); }
|
||||||
|
|||||||
Reference in New Issue
Block a user