diff options
84 files changed, 92 insertions, 81 deletions
diff --git a/doc/src/snippets/multimedia-snippets/audiorecorder.cpp b/doc/src/snippets/multimedia-snippets/audiorecorder.cpp index e93c44596..9d292c48f 100644 --- 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> diff --git a/doc/src/snippets/multimedia-snippets/player.cpp b/doc/src/snippets/multimedia-snippets/player.cpp index 35947f412..0db3c1447 100644 --- 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) diff --git a/examples/audiodevices/audiodevices.pro b/examples/audiodevices/audiodevices.pro index 3b77ec21b..87391db1f 100644 --- 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 diff --git a/examples/audiodevices/main.cpp b/examples/audiodevices/main.cpp index 691afb966..e64f2c50c 100644 --- a/examples/audiodevices/main.cpp +++ b/examples/audiodevices/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "audiodevices.h" diff --git a/examples/audioinput/audioinput.pro b/examples/audioinput/audioinput.pro index 6d2aa501d..cd6306673 100644 --- 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 diff --git a/examples/audioinput/main.cpp b/examples/audioinput/main.cpp index 9a9eb7042..a02c01ea9 100644 --- a/examples/audioinput/main.cpp +++ b/examples/audioinput/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "audioinput.h" diff --git a/examples/audiooutput/audiooutput.pro b/examples/audiooutput/audiooutput.pro index 38159fa70..b289cdbfc 100644 --- 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 diff --git a/examples/audiooutput/main.cpp b/examples/audiooutput/main.cpp index f411aeba1..0c187154e 100644 --- a/examples/audiooutput/main.cpp +++ b/examples/audiooutput/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "audiooutput.h" diff --git a/examples/audiorecorder/audiorecorder.cpp b/examples/audiorecorder/audiorecorder.cpp index ae6d3956e..38f08ac4b 100644 --- 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> diff --git a/examples/audiorecorder/audiorecorder.h b/examples/audiorecorder/audiorecorder.h index 5e079ee23..51a777ccd 100644 --- 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> diff --git a/examples/audiorecorder/audiorecorder.pro b/examples/audiorecorder/audiorecorder.pro index 5ab3ec951..b5b5d1055 100644 --- 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 diff --git a/examples/audiorecorder/main.cpp b/examples/audiorecorder/main.cpp index 80223a42d..12c564800 100644 --- 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[]) { diff --git a/examples/camera/camera.cpp b/examples/camera/camera.cpp index f9f37ce3d..b8bb675be 100644 --- 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 diff --git a/examples/camera/camera.pro b/examples/camera/camera.pro index e49e03186..a519354ed 100644 --- 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 diff --git a/examples/camera/imagesettings.cpp b/examples/camera/imagesettings.cpp index c1bb2bec6..c3b9b22c2 100644 --- 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> diff --git a/examples/camera/imagesettings.h b/examples/camera/imagesettings.h index 6a245fc26..74bca37d1 100644 --- 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 diff --git a/examples/camera/main.cpp b/examples/camera/main.cpp index 4fc98ec8d..af2fa4c86 100644 --- 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[]) { diff --git a/examples/camera/videosettings.cpp b/examples/camera/videosettings.cpp index f9ab33362..c1d816012 100644 --- 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> diff --git a/examples/camera/videosettings.h b/examples/camera/videosettings.h index b84dc8ed2..6cce31d0b 100644 --- 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 diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro index 455ea6298..ad544e9f4 100644 --- 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 diff --git a/examples/declarative-camera/qmlcamera.cpp b/examples/declarative-camera/qmlcamera.cpp index e137fe9c2..697f797ce 100644 --- 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> diff --git a/examples/examples.pro b/examples/examples.pro index 750d1f075..e26fab068 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -18,3 +18,4 @@ contains(QT_CONFIG, declarative) { SUBDIRS += declarative-radio } +QT+=widgets diff --git a/examples/player/main.cpp b/examples/player/main.cpp index 42326a764..b995658ba 100644 --- 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[]) { diff --git a/examples/player/player.cpp b/examples/player/player.cpp index 29612859a..18c9885aa 100644 --- 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) diff --git a/examples/player/player.h b/examples/player/player.h index ff579451b..eddf5f6b3 100644 --- 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> diff --git a/examples/player/player.pro b/examples/player/player.pro index 9559b47cc..58b6f8ed7 100644 --- 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 diff --git a/examples/player/playercontrols.cpp b/examples/player/playercontrols.cpp index 86272a52f..d6239fda1 100644 --- 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) diff --git a/examples/player/playercontrols.h b/examples/player/playercontrols.h index 26efb787a..dbcb2631b 100644 --- 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; diff --git a/examples/player/videowidget.cpp b/examples/player/videowidget.cpp index 5925aceec..b9809671d 100644 --- 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) diff --git a/examples/radio/main.cpp b/examples/radio/main.cpp index 1695d719e..56947b16b 100644 --- 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[]) { diff --git a/examples/radio/radio.cpp b/examples/radio/radio.cpp index 34a034235..f5e6591f3 100644 --- a/examples/radio/radio.cpp +++ b/examples/radio/radio.cpp @@ -40,7 +40,7 @@ #include "radio.h" -#include <QtGui> +#include <QtWidgets> Radio::Radio() { diff --git a/examples/radio/radio.h b/examples/radio/radio.h index c8e2ac3a3..bd30b3b97 100644 --- 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> diff --git a/examples/radio/radio.pro b/examples/radio/radio.pro index db4bb0d4d..de55c591b 100644 --- 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 diff --git a/examples/slideshow/main.cpp b/examples/slideshow/main.cpp index 23aca43bd..ffa493f17 100644 --- 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[]) { diff --git a/examples/slideshow/slideshow.cpp b/examples/slideshow/slideshow.cpp index 14d17ea6b..fea2ee64a 100644 --- 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) diff --git a/examples/slideshow/slideshow.pro b/examples/slideshow/slideshow.pro index bc3c208b3..c4cb38080 100644 --- 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 diff --git a/examples/spectrum/app/app.pro b/examples/spectrum/app/app.pro index 120ea43c1..28cc16ab0 100644 --- a/examples/spectrum/app/app.pro +++ b/examples/spectrum/app/app.pro @@ -90,3 +90,4 @@ macx { } +QT+=widgets diff --git a/examples/spectrum/app/main.cpp b/examples/spectrum/app/main.cpp index ca4f078db..af567a000 100644 --- 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) diff --git a/examples/spectrum/spectrum.pro b/examples/spectrum/spectrum.pro index 43e04664b..989ad11d9 100644 --- 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 diff --git a/examples/videographicsitem/main.cpp b/examples/videographicsitem/main.cpp index bf3f331aa..78721dab3 100644 --- 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) { diff --git a/examples/videographicsitem/videographicsitem.pro b/examples/videographicsitem/videographicsitem.pro index 26668117a..54002cf50 100644 --- 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 diff --git a/examples/videographicsitem/videoitem.cpp b/examples/videographicsitem/videoitem.cpp index e82fe9dd7..d314ac052 100644 --- 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) diff --git a/examples/videographicsitem/videoitem.h b/examples/videographicsitem/videoitem.h index 53342804a..48215a178 100644 --- 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, diff --git a/examples/videographicsitem/videoplayer.cpp b/examples/videographicsitem/videoplayer.cpp index dcda7cbb7..b406d51f5 100644 --- 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) diff --git a/examples/videographicsitem/videoplayer.h b/examples/videographicsitem/videoplayer.h index 5ca3eb0b3..e08a9dd2f 100644 --- 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; diff --git a/examples/videowidget/main.cpp b/examples/videowidget/main.cpp index b6fac52a1..725e637c5 100644 --- 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[]) { diff --git a/examples/videowidget/videoplayer.cpp b/examples/videowidget/videoplayer.cpp index 3f0c3f4bd..589d0c9b9 100644 --- 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) diff --git a/examples/videowidget/videoplayer.h b/examples/videowidget/videoplayer.h index 5dd0e1101..573baa152 100644 --- 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; diff --git a/examples/videowidget/videowidget.cpp b/examples/videowidget/videowidget.cpp index 8dbc1f07f..3b4fdfbb1 100644 --- 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] diff --git a/examples/videowidget/videowidget.h b/examples/videowidget/videowidget.h index 917e0063d..87987cba7 100644 --- 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; diff --git a/examples/videowidget/videowidget.pro b/examples/videowidget/videowidget.pro index 9874a8ef5..4e442563b 100644 --- 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 diff --git a/examples/videowidget/videowidgetsurface.cpp b/examples/videowidget/videowidgetsurface.cpp index 4a18c95a2..a0b71bf35 100644 --- 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> diff --git a/src/multimediakit/effects/qsoundeffect_qsound_p.cpp b/src/multimediakit/effects/qsoundeffect_qsound_p.cpp index 1706af9f1..0b9082eb5 100644 --- 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> diff --git a/src/multimediakit/multimediakit.pro b/src/multimediakit/multimediakit.pro index 7990429af..968832651 100644 --- 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 } diff --git a/src/multimediakitwidgets/qeglimagetexturesurface.cpp b/src/multimediakitwidgets/qeglimagetexturesurface.cpp index 685ae031f..dfab86c90 100644 --- 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> diff --git a/src/multimediakitwidgets/qgraphicsvideoitem_maemo6.cpp b/src/multimediakitwidgets/qgraphicsvideoitem_maemo6.cpp index e0f812ca6..387a25042 100644 --- 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> diff --git a/src/plugins/directshow/camera/dscameraservice.cpp b/src/plugins/directshow/camera/dscameraservice.cpp index 01da662c0..3b42a18d1 100644 --- 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> diff --git a/src/plugins/directshow/camera/dsvideodevicecontrol.cpp b/src/plugins/directshow/camera/dsvideodevicecontrol.cpp index 243e8403d..11da5d357 100644 --- 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" diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.h b/src/plugins/directshow/camera/dsvideowidgetcontrol.h index 35048ab79..62eb502f4 100644 --- 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> diff --git a/src/plugins/gstreamer/camerabuttonlistener_meego.cpp b/src/plugins/gstreamer/camerabuttonlistener_meego.cpp index c5cdf2ff9..5ee1daf42 100644 --- 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) : diff --git a/src/plugins/gstreamer/qgstreamergltexturerenderer.cpp b/src/plugins/gstreamer/qgstreamergltexturerenderer.cpp index af68096bd..615d23d82 100644 --- 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> diff --git a/src/plugins/gstreamer/qgstreamervideowidget.cpp b/src/plugins/gstreamer/qgstreamervideowidget.cpp index e1bf0037d..61c47f01b 100644 --- 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 diff --git a/src/plugins/gstreamer/qgstxvimagebuffer.cpp b/src/plugins/gstreamer/qgstxvimagebuffer.cpp index 55e58e2e0..31839920b 100644 --- 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" diff --git a/src/plugins/gstreamer/qvideosurfacegstsink.cpp b/src/plugins/gstreamer/qvideosurfacegstsink.cpp index 58fabeda4..6ccc1b1c5 100644 --- 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 diff --git a/src/plugins/gstreamer/qx11videosurface.cpp b/src/plugins/gstreamer/qx11videosurface.cpp index 035f9452d..f12be3e1b 100644 --- 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 diff --git a/src/plugins/gstreamer/qx11videosurface.h b/src/plugins/gstreamer/qx11videosurface.h index cac7a757e..ecc84e368 100644 --- 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 diff --git a/src/plugins/qt7/mediaplayer/qt7playercontrol.h b/src/plugins/qt7/mediaplayer/qt7playercontrol.h index 15ea20a4a..54b9f4e87 100644 --- 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 diff --git a/src/plugins/qt7/mediaplayer/qt7playersession.h b/src/plugins/qt7/mediaplayer/qt7playersession.h index de49a2398..c6e01151a 100644 --- 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 diff --git a/src/plugins/qt7/qt7movierenderer.h b/src/plugins/qt7/qt7movierenderer.h index 0dc100da3..705515833 100644 --- 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> diff --git a/src/plugins/qt7/qt7movievideowidget.h b/src/plugins/qt7/qt7movievideowidget.h index 8556e1866..d3e607801 100644 --- 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> diff --git a/src/plugins/qt7/qt7movieviewoutput.h b/src/plugins/qt7/qt7movieviewoutput.h index dffbbddbb..d48255d34 100644 --- 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" diff --git a/src/plugins/qt7/qt7movieviewrenderer.h b/src/plugins/qt7/qt7movieviewrenderer.h index 65eebf7f6..6d5cef7da 100644 --- 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> diff --git a/src/plugins/qt7/qt7videooutput.h b/src/plugins/qt7/qt7videooutput.h index 34feb391b..15b93c937 100644 --- 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 diff --git a/src/plugins/simulator/camera/simulatorvideoinputdevicecontrol.cpp b/src/plugins/simulator/camera/simulatorvideoinputdevicecontrol.cpp index 55f9c9f45..95c4e2da9 100644 --- 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> diff --git a/src/plugins/simulator/qsimulatorserviceplugin.cpp b/src/plugins/simulator/qsimulatorserviceplugin.cpp index 2971f59f7..e0e6d1293 100644 --- 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> diff --git a/src/plugins/v4l/radio/v4lradioservice.cpp b/src/plugins/v4l/radio/v4lradioservice.cpp index 122993229..1d9ad2fcb 100644 --- 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" diff --git a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp index b75ed8485..ddf3fce13 100644 --- 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 { diff --git a/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp b/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp index 01bc0e769..035310079 100644 --- 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 diff --git a/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp b/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp index f932bfd7d..79b3a0ab3 100644 --- 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 diff --git a/tests/auto/qmediaservice/qmediaservice.pro b/tests/auto/qmediaservice/qmediaservice.pro index 3f6cbb7d2..4d48c4887 100644 --- 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 - diff --git a/tests/auto/qmediaservice/tst_qmediaservice.cpp b/tests/auto/qmediaservice/tst_qmediaservice.cpp index 8f1dc38d1..3a46c5626 100644 --- 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 diff --git a/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp index 66fa43945..53ed906e9 100644 --- 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) diff --git a/tests/auto/qvideoframe/tst_qvideoframe.cpp b/tests/auto/qvideoframe/tst_qvideoframe.cpp index 37f7dc440..f400bfecb 100644 --- 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); diff --git a/tests/auto/qvideowidget/tst_qvideowidget.cpp b/tests/auto/qvideowidget/tst_qvideowidget.cpp index cfcd79927..58ab43eed 100644 --- 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 |