summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/multimedia')
-rw-r--r--src/imports/multimedia/multimedia.cpp4
-rw-r--r--src/imports/multimedia/qdeclarativeaudio_p.h4
-rw-r--r--src/imports/multimedia/qdeclarativecamera_p.h4
-rw-r--r--src/imports/multimedia/qdeclarativecamerafocus_p.h4
-rw-r--r--src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h2
-rw-r--r--src/imports/multimedia/qdeclarativeplaylist_p.h10
6 files changed, 14 insertions, 14 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index 1b8c87cc0..6a316a298 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -85,7 +85,7 @@ class QMultimediaDeclarativeModule : public QQmlExtensionPlugin
public:
QMultimediaDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
- virtual void registerTypes(const char *uri)
+ void registerTypes(const char *uri) override
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtMultimedia"));
@@ -155,7 +155,7 @@ public:
qmlRegisterType<QAbstractVideoFilter>();
}
- void initializeEngine(QQmlEngine *engine, const char *uri)
+ void initializeEngine(QQmlEngine *engine, const char *uri) override
{
Q_UNUSED(uri);
engine->addImageProvider("camera", new QDeclarativeCameraPreviewProvider);
diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h
index ad30fa729..4e2b94300 100644
--- a/src/imports/multimedia/qdeclarativeaudio_p.h
+++ b/src/imports/multimedia/qdeclarativeaudio_p.h
@@ -170,8 +170,8 @@ public:
PlaybackState playbackState() const;
void setPlaybackState(QMediaPlayer::State playbackState);
- void classBegin();
- void componentComplete();
+ void classBegin() override;
+ void componentComplete() override;
QObject *mediaObject() { return m_player; }
diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h
index 964d30117..97afa5b53 100644
--- a/src/imports/multimedia/qdeclarativecamera_p.h
+++ b/src/imports/multimedia/qdeclarativecamera_p.h
@@ -336,8 +336,8 @@ private Q_SLOTS:
void _q_availabilityChanged(QMultimedia::AvailabilityStatus);
protected:
- void classBegin();
- void componentComplete();
+ void classBegin() override;
+ void componentComplete() override;
private:
Q_DISABLE_COPY(QDeclarativeCamera)
diff --git a/src/imports/multimedia/qdeclarativecamerafocus_p.h b/src/imports/multimedia/qdeclarativecamerafocus_p.h
index 707102bff..16a48de53 100644
--- a/src/imports/multimedia/qdeclarativecamerafocus_p.h
+++ b/src/imports/multimedia/qdeclarativecamerafocus_p.h
@@ -131,8 +131,8 @@ public:
FocusZonesModel(QObject *parent = 0);
- int rowCount(const QModelIndex &parent = QModelIndex()) const;
- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
public slots:
void setFocusZones(const QCameraFocusZoneList &zones);
diff --git a/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h b/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h
index b9ac29b1e..cf5f0644c 100644
--- a/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h
+++ b/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h
@@ -61,7 +61,7 @@ public:
QDeclarativeCameraPreviewProvider();
~QDeclarativeCameraPreviewProvider();
- virtual QImage requestImage(const QString &id, QSize *size, const QSize& requestedSize);
+ QImage requestImage(const QString &id, QSize *size, const QSize& requestedSize) override;
static void registerPreview(const QString &id, const QImage &preview);
};
diff --git a/src/imports/multimedia/qdeclarativeplaylist_p.h b/src/imports/multimedia/qdeclarativeplaylist_p.h
index 22c853605..fa221a05b 100644
--- a/src/imports/multimedia/qdeclarativeplaylist_p.h
+++ b/src/imports/multimedia/qdeclarativeplaylist_p.h
@@ -126,12 +126,12 @@ public:
QString errorString() const;
QMediaPlaylist *mediaPlaylist() const { return m_playlist; }
- int rowCount(const QModelIndex &parent = QModelIndex()) const;
- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- QHash<int, QByteArray> roleNames() const;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+ QHash<int, QByteArray> roleNames() const override;
- void classBegin();
- void componentComplete();
+ void classBegin() override;
+ void componentComplete() override;
QQmlListProperty<QDeclarativePlaylistItem> items() {
return QQmlListProperty<QDeclarativePlaylistItem>(