Multimedia: examples coding style unification

Change-Id: Iffae3a276bb2b01f871aee76dc069ce006d69fce
Reviewed-by: David Schulz <david.schulz@digia.com>

examples/customvideosurface/customvideowidget/customvideowidget.pro

@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = customvideowidget
 
-QT += multimedia multimediawidgets
+QT += multimedia multimediawidgets widgets
 
 HEADERS = \
     videoplayer.h \
@@ -19,5 +19,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideowidget
 
 INSTALLS += target sources
-
-QT+=widgets

examples/customvideosurface/customvideowidget/videoplayer.h

@@ -41,10 +41,9 @@
 #ifndef VIDEOPLAYER_H
 #define VIDEOPLAYER_H
 
-#include <qmediaplayer.h>
-
-#include <QtGui/QMovie>
-#include <QtWidgets/QWidget>
+#include <QMediaPlayer>
+#include <QMovie>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 class QAbstractButton;
@@ -54,6 +53,7 @@ QT_END_NAMESPACE
 class VideoPlayer : public QWidget
 {
     Q_OBJECT
+
 public:
     VideoPlayer(QWidget *parent = 0);
     ~VideoPlayer();
@@ -74,4 +74,4 @@ private:
     QSlider *positionSlider;
 };
 
-#endif
+#endif // VIDEOPLAYER_H

examples/customvideosurface/customvideowidget/videowidget.h

@@ -43,18 +43,13 @@
 
 #include "videowidgetsurface.h"
 
-#include <QtWidgets/QWidget>
-
-QT_BEGIN_NAMESPACE
-class QAbstractVideoSurface;
-QT_END_NAMESPACE
-
-class VideoWidgetSurface;
+#include <QWidget>
 
 //! [0]
 class VideoWidget : public QWidget
 {
     Q_OBJECT
+
 public:
     VideoWidget(QWidget *parent = 0);
     ~VideoWidget();
@@ -72,4 +67,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // VIDEOWIDGET_H

examples/customvideosurface/customvideowidget/videowidgetsurface.h

@@ -41,15 +41,16 @@
 #ifndef VIDEOWIDGETSURFACE_H
 #define VIDEOWIDGETSURFACE_H
 
-#include <QtCore/QRect>
-#include <QtGui/QImage>
-#include <qabstractvideosurface.h>
-#include <qvideoframe.h>
+#include <QAbstractVideoSurface>
+#include <QImage>
+#include <QRect>
+#include <QVideoFrame>
 
 //! [0]
 class VideoWidgetSurface : public QAbstractVideoSurface
 {
     Q_OBJECT
+
 public:
     VideoWidgetSurface(QWidget *widget, QObject *parent = 0);