Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/plugins/avfoundation/mediaplayer/mediaplayer.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
	tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro

Change-Id: I5742596230dc510ba2a09eba624429bb67179194

5 files changed, 7 insertions, 7 deletions

diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro
index ec96be57c..60321fba8 100644
--- a/src/multimediawidgets/multimediawidgets.pro
+++ b/src/multimediawidgets/multimediawidgets.pro
@@ -7,8 +7,6 @@ qtHaveModule(opengl):!contains(QT_CONFIG, opengles1) {
    DEFINES += QT_NO_OPENGL
 }
 
-load(qt_module)
-
 PRIVATE_HEADERS += \
     qvideowidget_p.h \
     qpaintervideosurface_p.h \
@@ -44,3 +42,5 @@ maemo6 {
 }
 
 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
+
+load(qt_module)
diff --git a/src/multimediawidgets/qcameraviewfinder.h b/src/multimediawidgets/qcameraviewfinder.h
index 5be820179..2bd49fe83 100644
--- a/src/multimediawidgets/qcameraviewfinder.h
+++ b/src/multimediawidgets/qcameraviewfinder.h
@@ -61,7 +61,7 @@ class Q_MULTIMEDIAWIDGETS_EXPORT QCameraViewfinder : public QVideoWidget
 {
     Q_OBJECT
 public:
-    QCameraViewfinder(QWidget *parent = 0);
+    explicit QCameraViewfinder(QWidget *parent = Q_NULLPTR);
     ~QCameraViewfinder();
 
     QMediaObject *mediaObject() const;
diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h
index b6a76b9be..89de3397a 100644
--- a/src/multimediawidgets/qgraphicsvideoitem.h
+++ b/src/multimediawidgets/qgraphicsvideoitem.h
@@ -63,7 +63,7 @@ class Q_MULTIMEDIAWIDGETS_EXPORT QGraphicsVideoItem : public QGraphicsObject, pu
     Q_PROPERTY(QSizeF size READ size WRITE setSize)
     Q_PROPERTY(QSizeF nativeSize READ nativeSize NOTIFY nativeSizeChanged)
 public:
-    QGraphicsVideoItem(QGraphicsItem *parent = 0);
+    explicit QGraphicsVideoItem(QGraphicsItem *parent = Q_NULLPTR);
     ~QGraphicsVideoItem();
 
     QMediaObject *mediaObject() const;
@@ -81,7 +81,7 @@ public:
 
     QRectF boundingRect() const;
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR);
 
 Q_SIGNALS:
     void nativeSizeChanged(const QSizeF &size);
diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h
index c52ffe577..9aca9d3a4 100644
--- a/src/multimediawidgets/qvideowidget.h
+++ b/src/multimediawidgets/qvideowidget.h
@@ -64,7 +64,7 @@ class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWidget : public QWidget, public QMediaBin
     Q_PROPERTY(int saturation READ saturation WRITE setSaturation NOTIFY saturationChanged)
 
 public:
-    QVideoWidget(QWidget *parent = 0);
+    explicit QVideoWidget(QWidget *parent = Q_NULLPTR);
     ~QVideoWidget();
 
     QMediaObject *mediaObject() const;
diff --git a/src/multimediawidgets/qvideowidgetcontrol.h b/src/multimediawidgets/qvideowidgetcontrol.h
index a3eedb25e..7d9423882 100644
--- a/src/multimediawidgets/qvideowidgetcontrol.h
+++ b/src/multimediawidgets/qvideowidgetcontrol.h
@@ -85,7 +85,7 @@ Q_SIGNALS:
     void saturationChanged(int saturation);
 
 protected:
-    QVideoWidgetControl(QObject *parent = 0);
+    explicit QVideoWidgetControl(QObject *parent = Q_NULLPTR);
 };
 
 #define QVideoWidgetControl_iid "org.qt-project.qt.videowidgetcontrol/5.0"