Compile with refactor

Change-Id: I248f811a13ca00ccbf5d342a556d389bca625856 Reviewed-on: http://codereview.qt-project.org/4940 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-14 15:35:32 +02:00
parent 4840be0239
commit eedcc340f1
84 changed files with 92 additions and 81 deletions
--- a/doc/src/snippets/multimedia-snippets/audiorecorder.cpp
+++ b/doc/src/snippets/multimedia-snippets/audiorecorder.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/

-#include <QtGui>
+#include <QtWidgets>

 #include <qaudiocapturesource.h>
 #include <qmediarecorder.h>
--- a/doc/src/snippets/multimedia-snippets/player.cpp
+++ b/doc/src/snippets/multimedia-snippets/player.cpp
@@ -48,7 +48,7 @@
 #include <qmediaservice.h>
 #include <qmediaplaylist.h>

-#include <QtGui>
+#include <QtWidgets>

 Player::Player(QWidget *parent)
    : QWidget(parent)
--- a/examples/audiodevices/audiodevices.pro
+++ b/examples/audiodevices/audiodevices.pro
@@ -16,3 +16,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiodevices

 INSTALLS += target sources

+QT+=widgets
--- a/examples/audiodevices/main.cpp
+++ b/examples/audiodevices/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/

-#include <QtGui>
+#include <QtWidgets>

 #include "audiodevices.h"

--- a/examples/audioinput/audioinput.pro
+++ b/examples/audioinput/audioinput.pro
@@ -14,3 +14,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audioinput

 INSTALLS += target sources

+QT+=widgets
--- a/examples/audioinput/main.cpp
+++ b/examples/audioinput/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/

-#include <QtGui>
+#include <QtWidgets>

 #include "audioinput.h"

--- a/examples/audiooutput/audiooutput.pro
+++ b/examples/audiooutput/audiooutput.pro
@@ -14,3 +14,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiooutput

 INSTALLS += target sources

+QT+=widgets
--- a/examples/audiooutput/main.cpp
+++ b/examples/audiooutput/main.cpp
@@ -39,7 +39,7 @@
 ****************************************************************************/


-#include <QtGui>
+#include <QtWidgets>

 #include "audiooutput.h"

--- a/examples/audiorecorder/audiorecorder.cpp
+++ b/examples/audiorecorder/audiorecorder.cpp
@@ -39,7 +39,7 @@
 ****************************************************************************/

 #include <QtCore/qdir.h>
-#include <QtGui/qfiledialog.h>
+#include <QtWidgets/qfiledialog.h>

 #include <qaudiocapturesource.h>
 #include <qmediarecorder.h>
--- a/examples/audiorecorder/audiorecorder.h
+++ b/examples/audiorecorder/audiorecorder.h
@@ -42,7 +42,7 @@
 #define AUDIORECORDER_H

 #include <QtCore/qurl.h>
-#include <QtGui/qmainwindow.h>
+#include <QtWidgets/qmainwindow.h>

 #include <qmediarecorder.h>

--- a/examples/audiorecorder/audiorecorder.pro
+++ b/examples/audiorecorder/audiorecorder.pro
@@ -22,3 +22,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiorecorder

 INSTALLS += target sources

+QT+=widgets
--- a/examples/audiorecorder/main.cpp
+++ b/examples/audiorecorder/main.cpp
@@ -40,7 +40,7 @@

 #include "audiorecorder.h"

-#include <QtGui>
+#include <QtWidgets>

 int main(int argc, char *argv[])
 {
--- a/examples/camera/camera.cpp
+++ b/examples/camera/camera.cpp
@@ -51,7 +51,7 @@
 #include <qmessagebox.h>
 #include <qpalette.h>

-#include <QtGui>
+#include <QtWidgets>

 #if (defined(Q_WS_MAEMO_6)) && QT_VERSION >= 0x040700
 #define HAVE_CAMERA_BUTTONS
--- a/examples/camera/camera.pro
+++ b/examples/camera/camera.pro
@@ -25,3 +25,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/camera

 INSTALLS += target sources

+QT+=widgets
--- a/examples/camera/imagesettings.cpp
+++ b/examples/camera/imagesettings.cpp
@@ -41,7 +41,7 @@
 #include "imagesettings.h"
 #include "ui_imagesettings.h"

-#include <QtGui/qcombobox.h>
+#include <QtWidgets/qcombobox.h>
 #include <QtCore/qdebug.h>
 #include <qcameraimagecapture.h>
 #include <qmediaservice.h>
--- a/examples/camera/imagesettings.h
+++ b/examples/camera/imagesettings.h
@@ -41,7 +41,7 @@
 #ifndef IMAGESETTINGS_H
 #define IMAGESETTINGS_H

-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>
 #include <qmediaencodersettings.h>

 QT_BEGIN_NAMESPACE
--- a/examples/camera/main.cpp
+++ b/examples/camera/main.cpp
@@ -40,7 +40,7 @@

 #include "camera.h"

-#include <QtGui>
+#include <QtWidgets>

 int main(int argc, char *argv[])
 {
--- a/examples/camera/videosettings.cpp
+++ b/examples/camera/videosettings.cpp
@@ -41,7 +41,7 @@
 #include "videosettings.h"
 #include "ui_videosettings.h"

-#include <QtGui/qcombobox.h>
+#include <QtWidgets/qcombobox.h>
 #include <QtCore/qdebug.h>
 #include <qmediarecorder.h>
 #include <qmediaservice.h>
--- a/examples/camera/videosettings.h
+++ b/examples/camera/videosettings.h
@@ -41,7 +41,7 @@
 #ifndef VIDEOSETTINGS_H
 #define VIDEOSETTINGS_H

-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>
 #include <qmediaencodersettings.h>

 QT_BEGIN_NAMESPACE
--- a/examples/declarative-camera/declarative-camera.pro
+++ b/examples/declarative-camera/declarative-camera.pro
@@ -19,3 +19,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/qml_camera

 INSTALLS += target sources

+QT+=widgets
--- a/examples/declarative-camera/qmlcamera.cpp
+++ b/examples/declarative-camera/qmlcamera.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/

-#include <QtGui/QApplication>
-#include <QtGui/QDesktopWidget>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDesktopWidget>
 #include <QtQuick1/qdeclarativeview.h>
 #include <QtDeclarative/QDeclarativeEngine>

--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -18,3 +18,4 @@ contains(QT_CONFIG, declarative) {
    SUBDIRS += declarative-radio
 }

+QT+=widgets
--- a/examples/player/main.cpp
+++ b/examples/player/main.cpp
@@ -40,7 +40,7 @@

 #include "player.h"

-#include <QtGui>
+#include <QtWidgets>

 int main(int argc, char *argv[])
 {
--- a/examples/player/player.cpp
+++ b/examples/player/player.cpp
@@ -46,7 +46,7 @@
 #include <qmediaservice.h>
 #include <qmediaplaylist.h>

-#include <QtGui>
+#include <QtWidgets>


 Player::Player(QWidget *parent)
--- a/examples/player/player.h
+++ b/examples/player/player.h
@@ -41,7 +41,7 @@
 #ifndef PLAYER_H
 #define PLAYER_H

-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>

 #include <qmediaplayer.h>
 #include <qmediaplaylist.h>
--- a/examples/player/player.pro
+++ b/examples/player/player.pro
@@ -29,3 +29,4 @@ sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/player
 INSTALLS += target sources

+QT+=widgets
--- a/examples/player/playercontrols.cpp
+++ b/examples/player/playercontrols.cpp
@@ -40,11 +40,11 @@

 #include "playercontrols.h"

-#include <QtGui/qboxlayout.h>
-#include <QtGui/qslider.h>
-#include <QtGui/qstyle.h>
-#include <QtGui/qtoolbutton.h>
-#include <QtGui/qcombobox.h>
+#include <QtWidgets/qboxlayout.h>
+#include <QtWidgets/qslider.h>
+#include <QtWidgets/qstyle.h>
+#include <QtWidgets/qtoolbutton.h>
+#include <QtWidgets/qcombobox.h>

 PlayerControls::PlayerControls(QWidget *parent)
    : QWidget(parent)
--- a/examples/player/playercontrols.h
+++ b/examples/player/playercontrols.h
@@ -43,7 +43,7 @@

 #include <qmediaplayer.h>

-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>

 QT_BEGIN_NAMESPACE
 class QAbstractButton;
--- a/examples/player/videowidget.cpp
+++ b/examples/player/videowidget.cpp
@@ -40,7 +40,7 @@

 #include "videowidget.h"

-#include <QtGui>
+#include <QtWidgets>

 VideoWidget::VideoWidget(QWidget *parent)
    : QVideoWidget(parent)
--- a/examples/radio/main.cpp
+++ b/examples/radio/main.cpp
@@ -40,7 +40,7 @@

 #include "radio.h"

-#include <QtGui>
+#include <QtWidgets>

 int main(int argc, char *argv[])
 {
--- a/examples/radio/radio.cpp
+++ b/examples/radio/radio.cpp
@@ -40,7 +40,7 @@

 #include "radio.h"

-#include <QtGui>
+#include <QtWidgets>

 Radio::Radio()
 {
--- a/examples/radio/radio.h
+++ b/examples/radio/radio.h
@@ -41,7 +41,7 @@
 #ifndef RADIO_H
 #define RADIO_H

-#include <QtGui>
+#include <QtWidgets>

 #include <qradiotuner.h>

--- a/examples/radio/radio.pro
+++ b/examples/radio/radio.pro
@@ -16,3 +16,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/radio

 INSTALLS += target sources

+QT+=widgets
--- a/examples/slideshow/main.cpp
+++ b/examples/slideshow/main.cpp
@@ -40,7 +40,7 @@

 #include "slideshow.h"

-#include <QtGui>
+#include <QtWidgets>

 int main(int argc, char *argv[])
 {
--- a/examples/slideshow/slideshow.cpp
+++ b/examples/slideshow/slideshow.cpp
@@ -44,7 +44,7 @@
 #include <qmediaplaylist.h>
 #include <qvideowidget.h>

-#include <QtGui>
+#include <QtWidgets>

 SlideShow::SlideShow(QWidget *parent)
    : QMainWindow(parent)
--- a/examples/slideshow/slideshow.pro
+++ b/examples/slideshow/slideshow.pro
@@ -16,3 +16,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/slideshow

 INSTALLS += target sources

+QT+=widgets
--- a/examples/spectrum/app/app.pro
+++ b/examples/spectrum/app/app.pro
@@ -90,3 +90,4 @@ macx {
 }


+QT+=widgets
--- a/examples/spectrum/app/main.cpp
+++ b/examples/spectrum/app/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/

-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include "mainwidget.h"

 int main(int argc, char **argv)
--- a/examples/spectrum/spectrum.pro
+++ b/examples/spectrum/spectrum.pro
@@ -17,3 +17,4 @@ sources.files = README.txt spectrum.pri spectrum.pro TODO.txt
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/spectrum
 INSTALLS += sources

+QT+=widgets
--- a/examples/videographicsitem/main.cpp
+++ b/examples/videographicsitem/main.cpp
@@ -40,7 +40,7 @@

 #include "videoplayer.h"

-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>

 int main(int argc, char **argv)
 {
--- a/examples/videographicsitem/videographicsitem.pro
+++ b/examples/videographicsitem/videographicsitem.pro
@@ -18,3 +18,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videographicsitem

 INSTALLS += target sources

+QT+=widgets
--- a/examples/videographicsitem/videoitem.cpp
+++ b/examples/videographicsitem/videoitem.cpp
@@ -40,7 +40,7 @@

 #include "videoitem.h"

-#include <QtGui>
+#include <QtWidgets>
 #include <qvideosurfaceformat.h>

 VideoItem::VideoItem(QGraphicsItem *parent)
--- a/examples/videographicsitem/videoitem.h
+++ b/examples/videographicsitem/videoitem.h
@@ -42,7 +42,7 @@
 #define VIDEOITEM_H

 #include <qabstractvideosurface.h>
-#include <QtGui/QGraphicsItem>
+#include <QtWidgets/QGraphicsItem>

 class VideoItem
    : public QAbstractVideoSurface,
--- a/examples/videographicsitem/videoplayer.cpp
+++ b/examples/videographicsitem/videoplayer.cpp
@@ -41,7 +41,7 @@
 #include "videoplayer.h"
 #include "videoitem.h"

-#include <QtGui>
+#include <QtWidgets>
 #include <qvideosurfaceformat.h>

 #if !defined(QT_NO_OPENGL)
--- a/examples/videographicsitem/videoplayer.h
+++ b/examples/videographicsitem/videoplayer.h
@@ -44,7 +44,7 @@
 #include <qmediaplayer.h>

 #include <QtGui/QMovie>
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>

 QT_BEGIN_NAMESPACE
 class QAbstractButton;
--- a/examples/videowidget/main.cpp
+++ b/examples/videowidget/main.cpp
@@ -40,7 +40,7 @@

 #include "videoplayer.h"

-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>

 int main(int argc, char *argv[])
 {
--- a/examples/videowidget/videoplayer.cpp
+++ b/examples/videowidget/videoplayer.cpp
@@ -42,7 +42,7 @@

 #include "videowidget.h"

-#include <QtGui>
+#include <QtWidgets>
 #include <qvideosurfaceformat.h>

 VideoPlayer::VideoPlayer(QWidget *parent)
--- a/examples/videowidget/videoplayer.h
+++ b/examples/videowidget/videoplayer.h
@@ -44,7 +44,7 @@
 #include <qmediaplayer.h>

 #include <QtGui/QMovie>
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>

 QT_BEGIN_NAMESPACE
 class QAbstractButton;
--- a/examples/videowidget/videowidget.cpp
+++ b/examples/videowidget/videowidget.cpp
@@ -42,7 +42,7 @@

 #include "videowidgetsurface.h"

-#include <QtGui>
+#include <QtWidgets>
 #include <qvideosurfaceformat.h>

 //! [0]
--- a/examples/videowidget/videowidget.h
+++ b/examples/videowidget/videowidget.h
@@ -43,7 +43,7 @@

 #include "videowidgetsurface.h"

-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>

 QT_BEGIN_NAMESPACE
 class QAbstractVideoSurface;
--- a/examples/videowidget/videowidget.pro
+++ b/examples/videowidget/videowidget.pro
@@ -20,3 +20,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videowidget

 INSTALLS += target sources

+QT+=widgets
--- a/examples/videowidget/videowidgetsurface.cpp
+++ b/examples/videowidget/videowidgetsurface.cpp
@@ -40,7 +40,7 @@

 #include "videowidgetsurface.h"

-#include <QtGui>
+#include <QtWidgets>
 #include <qabstractvideosurface.h>
 #include <qvideosurfaceformat.h>

--- a/src/multimediakit/effects/qsoundeffect_qsound_p.cpp
+++ b/src/multimediakit/effects/qsoundeffect_qsound_p.cpp
@@ -53,7 +53,7 @@
 #include "qsoundeffect_qsound_p.h"

 #include <QtCore/qcoreapplication.h>
-#include <QtGui/qsound.h>
+#include <QtWidgets/qsound.h>
 #include <QtCore/qstringlist.h>


--- a/src/multimediakit/multimediakit.pro
+++ b/src/multimediakit/multimediakit.pro
@@ -3,13 +3,12 @@ load(qt_module)
 # distinct from QtMultimedia
 TARGET = QtMultimediaKit
 QPRO_PWD = $$PWD
-QT = core network gui widgets
+QT = core network gui

 CONFIG += module
 MODULE_PRI += ../../modules/qt_multimediakit.pri

 contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
-   QT += opengl
 } else {
   DEFINES += QT_NO_OPENGL
 }
--- a/src/multimediakitwidgets/qeglimagetexturesurface.cpp
+++ b/src/multimediakitwidgets/qeglimagetexturesurface.cpp
@@ -46,7 +46,7 @@
 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
 #include <QtGui/qpainter.h>
-#include <QtGui/qx11info_x11.h>
+#include <QtWidgets/qx11info_x11.h>
 #include <qvideosurfaceformat.h>


--- a/src/multimediakitwidgets/qgraphicsvideoitem_maemo6.cpp
+++ b/src/multimediakitwidgets/qgraphicsvideoitem_maemo6.cpp
@@ -45,7 +45,7 @@
 #include <QtCore/qpointer.h>
 #include <QtCore/qbasictimer.h>

-#include <QtGui/qgraphicsscene.h>
+#include <QtWidgets/qgraphicsscene.h>

 #include <qmediaobject.h>
 #include <qmediaservice.h>
--- a/src/plugins/directshow/camera/dscameraservice.cpp
+++ b/src/plugins/directshow/camera/dscameraservice.cpp
@@ -41,7 +41,7 @@

 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 #include <QVideoWidgetControl.h>


--- a/src/plugins/directshow/camera/dsvideodevicecontrol.cpp
+++ b/src/plugins/directshow/camera/dsvideodevicecontrol.cpp
@@ -41,7 +41,7 @@

 #include <QDebug>
 #include <QFile>
-#include <QtGui/QIcon>
+#include <QtWidgets/QIcon>

 #include "dsvideodevicecontrol.h"
 #include "dscamerasession.h"
--- a/src/plugins/directshow/camera/dsvideowidgetcontrol.h
+++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.h
@@ -43,7 +43,7 @@
 #define DSVIDEOWIDGETCONTROL_H

 #include <QtCore/qobject.h>
-#include <QtGui>
+#include <QtWidgets>
 #include <QtMultimedia/qvideoframe.h>
 #include <QtMultimedia/qabstractvideosurface.h>
 #include <QtMultimedia/qvideosurfaceformat.h>
--- a/src/plugins/gstreamer/camerabuttonlistener_meego.cpp
+++ b/src/plugins/gstreamer/camerabuttonlistener_meego.cpp
@@ -41,9 +41,9 @@

 #include "camerabuttonlistener_meego.h"

-#include <QtGui/qapplication.h>
+#include <QtWidgets/qapplication.h>
 #include <QtGui/qevent.h>
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 #include <QtCore/qdebug.h>

 CameraButtonListener::CameraButtonListener(QObject *parent) :
--- a/src/plugins/gstreamer/qgstreamergltexturerenderer.cpp
+++ b/src/plugins/gstreamer/qgstreamergltexturerenderer.cpp
@@ -44,8 +44,8 @@
 #include "qgstutils.h"

 #include <QtGui/qevent.h>
-#include <QtGui/qapplication.h>
-#include <QtGui/qx11info_x11.h>
+#include <QtWidgets/qapplication.h>
+#include <QtWidgets/qx11info_x11.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qthread.h>

--- a/src/plugins/gstreamer/qgstreamervideowidget.cpp
+++ b/src/plugins/gstreamer/qgstreamervideowidget.cpp
@@ -44,7 +44,7 @@

 #include <QtCore/qcoreevent.h>
 #include <QtCore/qdebug.h>
-#include <QtGui/qapplication.h>
+#include <QtWidgets/qapplication.h>
 #include <QtGui/qpainter.h>

 #ifdef Q_WS_X11
--- a/src/plugins/gstreamer/qgstxvimagebuffer.cpp
+++ b/src/plugins/gstreamer/qgstxvimagebuffer.cpp
@@ -42,7 +42,7 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qthread.h>
 #include <QtCore/qvariant.h>
-#include <QtGui/qx11info_x11.h>
+#include <QtWidgets/qx11info_x11.h>

 #include "qgstxvimagebuffer.h"
 #include "qvideosurfacegstsink.h"
--- a/src/plugins/gstreamer/qvideosurfacegstsink.cpp
+++ b/src/plugins/gstreamer/qvideosurfacegstsink.cpp
@@ -49,7 +49,7 @@
 #include "qgstvideobuffer.h"

 #if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO)
-#include <QtGui/qx11info_x11.h>
+#include <QtWidgets/qx11info_x11.h>
 #include "qgstxvimagebuffer.h"
 #endif

--- a/src/plugins/gstreamer/qx11videosurface.cpp
+++ b/src/plugins/gstreamer/qx11videosurface.cpp
@@ -41,7 +41,7 @@

 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
-#include <QtGui/qx11info_x11.h>
+#include <QtWidgets/qx11info_x11.h>
 #include <qvideosurfaceformat.h>

 #ifndef QT_NO_XVIDEO
--- a/src/plugins/gstreamer/qx11videosurface.h
+++ b/src/plugins/gstreamer/qx11videosurface.h
@@ -42,7 +42,7 @@
 #ifndef QX11VIDEOSURFACE_H
 #define QX11VIDEOSURFACE_H

-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 #include <qabstractvideosurface.h>

 #ifndef QT_NO_XVIDEO
--- a/src/plugins/qt7/mediaplayer/qt7playercontrol.h
+++ b/src/plugins/qt7/mediaplayer/qt7playercontrol.h
@@ -47,7 +47,7 @@
 #include <qmediaplayercontrol.h>
 #include <qmediaplayer.h>

-#include <QtGui/qmacdefines_mac.h>
+#include <QtWidgets/qmacdefines_mac.h>


 QT_BEGIN_NAMESPACE
--- a/src/plugins/qt7/mediaplayer/qt7playersession.h
+++ b/src/plugins/qt7/mediaplayer/qt7playersession.h
@@ -50,7 +50,7 @@
 #include <qmediaplayercontrol.h>
 #include <qmediaplayer.h>

-#include <QtGui/qmacdefines_mac.h>
+#include <QtWidgets/qmacdefines_mac.h>


 QT_BEGIN_NAMESPACE
--- a/src/plugins/qt7/qt7movierenderer.h
+++ b/src/plugins/qt7/qt7movierenderer.h
@@ -50,7 +50,7 @@
 #include <qvideorenderercontrol.h>
 #include <qmediaplayer.h>

-#include <QtGui/qmacdefines_mac.h>
+#include <QtWidgets/qmacdefines_mac.h>
 #include "qt7videooutput.h"

 #include <QuartzCore/CVOpenGLTexture.h>
--- a/src/plugins/qt7/qt7movievideowidget.h
+++ b/src/plugins/qt7/qt7movievideowidget.h
@@ -48,7 +48,7 @@
 #include <qvideowindowcontrol.h>
 #include <qmediaplayer.h>

-#include <QtGui/qmacdefines_mac.h>
+#include <QtWidgets/qmacdefines_mac.h>
 #include "qt7videooutput.h"

 #include <QuartzCore/CVOpenGLTexture.h>
--- a/src/plugins/qt7/qt7movieviewoutput.h
+++ b/src/plugins/qt7/qt7movieviewoutput.h
@@ -47,7 +47,7 @@
 #include <qvideowindowcontrol.h>
 #include <qmediaplayer.h>

-#include <QtGui/qmacdefines_mac.h>
+#include <QtWidgets/qmacdefines_mac.h>
 #include "qt7videooutput.h"


--- a/src/plugins/qt7/qt7movieviewrenderer.h
+++ b/src/plugins/qt7/qt7movieviewrenderer.h
@@ -48,7 +48,7 @@
 #include <qvideowindowcontrol.h>
 #include <qmediaplayer.h>

-#include <QtGui/qmacdefines_mac.h>
+#include <QtWidgets/qmacdefines_mac.h>
 #include "qt7videooutput.h"
 #include <qvideoframe.h>

--- a/src/plugins/qt7/qt7videooutput.h
+++ b/src/plugins/qt7/qt7videooutput.h
@@ -50,7 +50,7 @@
 #include <qvideorenderercontrol.h>
 #include <qmediaplayer.h>

-#include <QtGui/qmacdefines_mac.h>
+#include <QtWidgets/qmacdefines_mac.h>


 QT_BEGIN_NAMESPACE
--- a/src/plugins/simulator/camera/simulatorvideoinputdevicecontrol.cpp
+++ b/src/plugins/simulator/camera/simulatorvideoinputdevicecontrol.cpp
@@ -41,7 +41,7 @@

 #include "simulatorvideoinputdevicecontrol.h"

-#include <QtGui/QIcon>
+#include <QtWidgets/QIcon>
 #include <QtCore/QDir>
 #include <QtCore/QDebug>
 #include <QtCore/QStringList>
--- a/src/plugins/simulator/qsimulatorserviceplugin.cpp
+++ b/src/plugins/simulator/qsimulatorserviceplugin.cpp
@@ -41,7 +41,7 @@

 #include <QtCore/qstring.h>
 #include <QtCore/qdebug.h>
-#include <QtGui/QIcon>
+#include <QtWidgets/QIcon>
 #include <QtCore/QDir>
 #include <QtCore/QDebug>

--- a/src/plugins/v4l/radio/v4lradioservice.cpp
+++ b/src/plugins/v4l/radio/v4lradioservice.cpp
@@ -42,7 +42,7 @@
 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qfile.h>
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>

 #include "v4lradioservice.h"
 #include "v4lradiocontrol.h"
--- a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
+++ b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
@@ -51,7 +51,7 @@
 #include <qmediaserviceprovider.h>
 #include <qmetadatareadercontrol.h>

-#include <QtGui/qapplication.h>
+#include <QtWidgets/qapplication.h>

 class tst_QDeclarativeAudio : public QObject
 {
--- a/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp
+++ b/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp
@@ -55,7 +55,7 @@
 #include <qvideowindowcontrol.h>
 #include <qvideosurfaceformat.h>

-#include <QtGui/qapplication.h>
+#include <QtWidgets/qapplication.h>
 #include <QtGui/qpainter.h>

 class tst_QDeclarativeVideo : public QObject
--- a/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
+++ b/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
@@ -52,9 +52,9 @@
 #include <qabstractvideosurface.h>
 #include <qvideosurfaceformat.h>

-#include <QtGui/qapplication.h>
-#include <QtGui/qgraphicsscene.h>
-#include <QtGui/qgraphicsview.h>
+#include <QtWidgets/qapplication.h>
+#include <QtWidgets/qgraphicsscene.h>
+#include <QtWidgets/qgraphicsview.h>

 QT_USE_NAMESPACE
 class tst_QGraphicsVideoItem : public QObject
--- a/tests/auto/qmediaservice/qmediaservice.pro
+++ b/tests/auto/qmediaservice/qmediaservice.pro
@@ -4,4 +4,3 @@ QT += multimediakit-private
 CONFIG += no_private_qt_headers_warning

 SOURCES += tst_qmediaservice.cpp
-
--- a/tests/auto/qmediaservice/tst_qmediaservice.cpp
+++ b/tests/auto/qmediaservice/tst_qmediaservice.cpp
@@ -47,8 +47,7 @@
 #include <qmediacontrol.h>
 #include <qmediaservice.h>

-#include <QtGui/qapplication.h>
-#include <QtGui/qstyle.h>
+#include <QtCore/qcoreapplication.h>

 QT_BEGIN_NAMESPACE

--- a/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp
+++ b/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp
@@ -44,7 +44,7 @@
 #include <private/qpaintervideosurface_p.h>
 #include <QtTest/QtTest>

-#include <QtGui/qapplication.h>
+#include <QtWidgets/qapplication.h>
 #include <qvideosurfaceformat.h>

 #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1)
--- a/tests/auto/qvideoframe/tst_qvideoframe.cpp
+++ b/tests/auto/qvideoframe/tst_qvideoframe.cpp
@@ -650,7 +650,7 @@ void tst_QVideoFrame::mapImage()
    QVERIFY(frame.map(mode));

    QVERIFY(frame.bits());
-    QCOMPARE(frame.mappedBytes(), image.numBytes());
+    QCOMPARE(frame.mappedBytes(), image.byteCount());
    QCOMPARE(frame.bytesPerLine(), image.bytesPerLine());
    QCOMPARE(frame.mapMode(), mode);

--- a/tests/auto/qvideowidget/tst_qvideowidget.cpp
+++ b/tests/auto/qvideowidget/tst_qvideowidget.cpp
@@ -56,7 +56,7 @@
 #include <qabstractvideosurface.h>
 #include <qvideosurfaceformat.h>

-#include <QtGui/qapplication.h>
+#include <QtWidgets/qapplication.h>

 QT_USE_NAMESPACE
 class tst_QVideoWidget : public QObject