QtMultimedia: Widget library split.

17 files changed, 27 insertions, 15 deletions

diff --git a/examples/multimedia/audiodevices/audiodevices.pro b/examples/multimedia/audiodevices/audiodevices.pro
index e86af498d..573cba5e4 100644
--- a/examples/multimedia/audiodevices/audiodevices.pro
+++ b/examples/multimedia/audiodevices/audiodevices.pro
@@ -3,7 +3,7 @@ SOURCES       = audiodevices.cpp \
                 main.cpp
 FORMS        += audiodevicesbase.ui
 
-QT           += multimedia
+QT           += widgets multimedia
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/multimedia/audiodevices
diff --git a/examples/multimedia/audiodevices/main.cpp b/examples/multimedia/audiodevices/main.cpp
index 79a6efbd0..574f8a499 100644
--- a/examples/multimedia/audiodevices/main.cpp
+++ b/examples/multimedia/audiodevices/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets/QApplication>
 
 #include "audiodevices.h"
 
diff --git a/examples/multimedia/audioinput/audioinput.pro b/examples/multimedia/audioinput/audioinput.pro
index b474a8cb9..40c18fcc2 100644
--- a/examples/multimedia/audioinput/audioinput.pro
+++ b/examples/multimedia/audioinput/audioinput.pro
@@ -2,7 +2,7 @@ HEADERS       = audioinput.h
 SOURCES       = audioinput.cpp \
                 main.cpp
 
-QT           += multimedia
+QT           += widgets multimedia
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/multimedia/audioinput
diff --git a/examples/multimedia/audioinput/main.cpp b/examples/multimedia/audioinput/main.cpp
index bdae9986d..ab4a330e8 100644
--- a/examples/multimedia/audioinput/main.cpp
+++ b/examples/multimedia/audioinput/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets/QApplication>
 
 #include "audioinput.h"
 
diff --git a/examples/multimedia/audiooutput/audiooutput.pro b/examples/multimedia/audiooutput/audiooutput.pro
index ca884e21a..47669d23d 100644
--- a/examples/multimedia/audiooutput/audiooutput.pro
+++ b/examples/multimedia/audiooutput/audiooutput.pro
@@ -2,7 +2,7 @@ HEADERS       = audiooutput.h
 SOURCES       = audiooutput.cpp \
                 main.cpp
 
-QT           += multimedia
+QT           += widgets multimedia
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/multimedia/audiooutput
diff --git a/examples/multimedia/audiooutput/main.cpp b/examples/multimedia/audiooutput/main.cpp
index 8492f81bf..87260f413 100644
--- a/examples/multimedia/audiooutput/main.cpp
+++ b/examples/multimedia/audiooutput/main.cpp
@@ -38,8 +38,7 @@
 **
 ****************************************************************************/
 
-
-#include <QtGui>
+#include <QtWidgets/QApplication>
 
 #include "audiooutput.h"
 
diff --git a/examples/multimedia/videographicsitem/main.cpp b/examples/multimedia/videographicsitem/main.cpp
index f7f88cc30..9cc3fcba9 100644
--- a/examples/multimedia/videographicsitem/main.cpp
+++ b/examples/multimedia/videographicsitem/main.cpp
@@ -40,7 +40,7 @@
 
 #include "videoplayer.h"
 
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 int main(int argc, char **argv)
 {
diff --git a/examples/multimedia/videographicsitem/videographicsitem.pro b/examples/multimedia/videographicsitem/videographicsitem.pro
index 3ad1bc1dd..c6c7146e7 100644
--- a/examples/multimedia/videographicsitem/videographicsitem.pro
+++ b/examples/multimedia/videographicsitem/videographicsitem.pro
@@ -1,4 +1,4 @@
-QT += multimedia
+QT += widgets multimedia
 
 contains(QT_CONFIG, opengl): QT += opengl
 
diff --git a/examples/multimedia/videographicsitem/videoitem.h b/examples/multimedia/videographicsitem/videoitem.h
index a0080ac35..807f5aa81 100644
--- a/examples/multimedia/videographicsitem/videoitem.h
+++ b/examples/multimedia/videographicsitem/videoitem.h
@@ -42,7 +42,7 @@
 #define VIDEOITEM_H
 
 #include <QtMultimedia/QAbstractVideoSurface>
-#include <QtGui/QGraphicsItem>
+#include <QtWidgets/QGraphicsItem>
 
 class VideoItem
     : public QAbstractVideoSurface,
diff --git a/examples/multimedia/videographicsitem/videoplayer.cpp b/examples/multimedia/videographicsitem/videoplayer.cpp
index 8d6775adb..ca25f815c 100644
--- a/examples/multimedia/videographicsitem/videoplayer.cpp
+++ b/examples/multimedia/videographicsitem/videoplayer.cpp
@@ -41,6 +41,13 @@
 #include "videoplayer.h"
 #include "videoitem.h"
 
+#include <QtWidgets/QGraphicsScene>
+#include <QtWidgets/QGraphicsView>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QFileDialog>
 #include <QtMultimedia>
 
 #ifndef QT_NO_OPENGL
diff --git a/examples/multimedia/videographicsitem/videoplayer.h b/examples/multimedia/videographicsitem/videoplayer.h
index 33c3d26f1..9938a4ade 100644
--- a/examples/multimedia/videographicsitem/videoplayer.h
+++ b/examples/multimedia/videographicsitem/videoplayer.h
@@ -42,7 +42,7 @@
 #define VIDEOPLAYER_H
 
 #include <QtGui/QMovie>
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 
 QT_BEGIN_NAMESPACE
 class QAbstractButton;
diff --git a/examples/multimedia/videowidget/main.cpp b/examples/multimedia/videowidget/main.cpp
index b1d3524ea..0ebf2431f 100644
--- a/examples/multimedia/videowidget/main.cpp
+++ b/examples/multimedia/videowidget/main.cpp
@@ -40,7 +40,7 @@
 
 #include "videoplayer.h"
 
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/multimedia/videowidget/videoplayer.cpp b/examples/multimedia/videowidget/videoplayer.cpp
index 3bc18303c..9014260c1 100644
--- a/examples/multimedia/videowidget/videoplayer.cpp
+++ b/examples/multimedia/videowidget/videoplayer.cpp
@@ -42,6 +42,11 @@
 
 #include "videowidget.h"
 
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QSlider>
 #include <QtMultimedia>
 
 VideoPlayer::VideoPlayer(QWidget *parent)
diff --git a/examples/multimedia/videowidget/videoplayer.h b/examples/multimedia/videowidget/videoplayer.h
index 11bec4a66..d29b01af4 100644
--- a/examples/multimedia/videowidget/videoplayer.h
+++ b/examples/multimedia/videowidget/videoplayer.h
@@ -42,7 +42,7 @@
 #define VIDEOPLAYER_H
 
 #include <QtGui/QMovie>
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 
 QT_BEGIN_NAMESPACE
 class QAbstractButton;
diff --git a/examples/multimedia/videowidget/videowidget.h b/examples/multimedia/videowidget/videowidget.h
index c2b722b56..30dd162fc 100644
--- a/examples/multimedia/videowidget/videowidget.h
+++ b/examples/multimedia/videowidget/videowidget.h
@@ -43,7 +43,7 @@
 
 #include "videowidgetsurface.h"
 
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 
 QT_BEGIN_NAMESPACE
 class QAbstractVideoSurface;
diff --git a/examples/multimedia/videowidget/videowidget.pro b/examples/multimedia/videowidget/videowidget.pro
index 90665b6db..8b73b6039 100644
--- a/examples/multimedia/videowidget/videowidget.pro
+++ b/examples/multimedia/videowidget/videowidget.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += multimedia
+QT += widgets multimedia
 
 HEADERS = \
     videoplayer.h \
diff --git a/examples/multimedia/videowidget/videowidgetsurface.cpp b/examples/multimedia/videowidget/videowidgetsurface.cpp
index b53771698..210b81275 100644
--- a/examples/multimedia/videowidget/videowidgetsurface.cpp
+++ b/examples/multimedia/videowidget/videowidgetsurface.cpp
@@ -40,6 +40,7 @@
 
 #include "videowidgetsurface.h"
 
+#include <QtWidgets/QWidget>
 #include <QtMultimedia>
 
 VideoWidgetSurface::VideoWidgetSurface(QWidget *widget, QObject *parent)