slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compile with refactor

Browse Source 
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>
This commit is contained in:
Gunnar Sletta
2011-09-14 15:35:32 +02:00
committed by Qt by Nokia
parent 4840be0239
commit eedcc340f1
84 changed files with 92 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/src/snippets/multimedia-snippets/audiorecorder.cpp
View File

@@ -39,7 +39,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtGui> #include <QtWidgets>
#include <qaudiocapturesource.h> #include <qaudiocapturesource.h>
#include <qmediarecorder.h> #include <qmediarecorder.h>

2
doc/src/snippets/multimedia-snippets/player.cpp
View File

@@ -48,7 +48,7 @@
#include <qmediaservice.h> #include <qmediaservice.h>
#include <qmediaplaylist.h> #include <qmediaplaylist.h>
#include <QtGui> #include <QtWidgets>
Player::Player(QWidget *parent) Player::Player(QWidget *parent)
: QWidget(parent) : QWidget(parent)

1
examples/audiodevices/audiodevices.pro
View File

@@ -16,3 +16,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiodevices
INSTALLS += target sources INSTALLS += target sources
QT+=widgets

2
examples/audiodevices/main.cpp
View File

@@ -38,7 +38,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtGui> #include <QtWidgets>
#include "audiodevices.h" #include "audiodevices.h"

1
examples/audioinput/audioinput.pro
View File

@@ -14,3 +14,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audioinput
INSTALLS += target sources INSTALLS += target sources
QT+=widgets

2
examples/audioinput/main.cpp
View File

@@ -38,7 +38,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtGui> #include <QtWidgets>
#include "audioinput.h" #include "audioinput.h"

1
examples/audiooutput/audiooutput.pro
View File

@@ -14,3 +14,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiooutput
INSTALLS += target sources INSTALLS += target sources
QT+=widgets

2
examples/audiooutput/main.cpp
View File

@@ -39,7 +39,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtGui> #include <QtWidgets>
#include "audiooutput.h" #include "audiooutput.h"

2
examples/audiorecorder/audiorecorder.cpp
View File

@@ -39,7 +39,7 @@
****************************************************************************/ ****************************************************************************/
#include <QtCore/qdir.h> #include <QtCore/qdir.h>
#include <QtGui/qfiledialog.h> #include <QtWidgets/qfiledialog.h>
#include <qaudiocapturesource.h> #include <qaudiocapturesource.h>
#include <qmediarecorder.h> #include <qmediarecorder.h>

2
examples/audiorecorder/audiorecorder.h
View File

@@ -42,7 +42,7 @@
#define AUDIORECORDER_H #define AUDIORECORDER_H
#include <QtCore/qurl.h> #include <QtCore/qurl.h>
#include <QtGui/qmainwindow.h> #include <QtWidgets/qmainwindow.h>
#include <qmediarecorder.h> #include <qmediarecorder.h>

1
examples/audiorecorder/audiorecorder.pro
View File

@@ -22,3 +22,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/audiorecorder
INSTALLS += target sources INSTALLS += target sources
QT+=widgets

2
examples/audiorecorder/main.cpp
View File

@@ -40,7 +40,7 @@
#include "audiorecorder.h" #include "audiorecorder.h"
#include <QtGui> #include <QtWidgets>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {

2
examples/camera/camera.cpp
View File

@@ -51,7 +51,7 @@
#include <qmessagebox.h> #include <qmessagebox.h>
#include <qpalette.h> #include <qpalette.h>
#include <QtGui> #include <QtWidgets>
#if (defined(Q_WS_MAEMO_6)) && QT_VERSION >= 0x040700 #if (defined(Q_WS_MAEMO_6)) && QT_VERSION >= 0x040700
#define HAVE_CAMERA_BUTTONS #define HAVE_CAMERA_BUTTONS

1
examples/camera/camera.pro
View File

@@ -25,3 +25,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/camera
INSTALLS += target sources INSTALLS += target sources
QT+=widgets

2
examples/camera/imagesettings.cpp
View File

@@ -41,7 +41,7 @@
#include "imagesettings.h" #include "imagesettings.h"
#include "ui_imagesettings.h" #include "ui_imagesettings.h"
#include <QtGui/qcombobox.h> #include <QtWidgets/qcombobox.h>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <qcameraimagecapture.h> #include <qcameraimagecapture.h>
#include <qmediaservice.h> #include <qmediaservice.h>

2
examples/camera/imagesettings.h
View File

@@ -41,7 +41,7 @@
#ifndef IMAGESETTINGS_H #ifndef IMAGESETTINGS_H
#define IMAGESETTINGS_H #define IMAGESETTINGS_H
#include <QtGui/QDialog> #include <QtWidgets/QDialog>
#include <qmediaencodersettings.h> #include <qmediaencodersettings.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
examples/camera/main.cpp
View File

@@ -40,7 +40,7 @@
#include "camera.h" #include "camera.h"
#include <QtGui> #include <QtWidgets>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {

2
examples/camera/videosettings.cpp
View File

@@ -41,7 +41,7 @@
#include "videosettings.h" #include "videosettings.h"
#include "ui_videosettings.h" #include "ui_videosettings.h"
#include <QtGui/qcombobox.h> #include <QtWidgets/qcombobox.h>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <qmediarecorder.h> #include <qmediarecorder.h>
#include <qmediaservice.h> #include <qmediaservice.h>

2
examples/camera/videosettings.h
View File

@@ -41,7 +41,7 @@
#ifndef VIDEOSETTINGS_H #ifndef VIDEOSETTINGS_H
#define VIDEOSETTINGS_H #define VIDEOSETTINGS_H
#include <QtGui/QDialog> #include <QtWidgets/QDialog>
#include <qmediaencodersettings.h> #include <qmediaencodersettings.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

1
examples/declarative-camera/declarative-camera.pro
View File

@@ -19,3 +19,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/qml_camera
INSTALLS += target sources INSTALLS += target sources
QT+=widgets

4
examples/declarative-camera/qmlcamera.cpp
View File

@@ -38,8 +38,8 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtGui/QApplication> #include <QtWidgets/QApplication>
#include <QtGui/QDesktopWidget> #include <QtWidgets/QDesktopWidget>
#include <QtQuick1/qdeclarativeview.h> #include <QtQuick1/qdeclarativeview.h>
#include <QtDeclarative/QDeclarativeEngine> #include <QtDeclarative/QDeclarativeEngine>

1
examples/examples.pro
View File

@@ -18,3 +18,4 @@ contains(QT_CONFIG, declarative) {
SUBDIRS += declarative-radio SUBDIRS += declarative-radio
} }
QT+=widgets

2
examples/player/main.cpp
View File

@@ -40,7 +40,7 @@
#include "player.h" #include "player.h"
#include <QtGui> #include <QtWidgets>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {

2
examples/player/player.cpp
View File

@@ -46,7 +46,7 @@
#include <qmediaservice.h> #include <qmediaservice.h>
#include <qmediaplaylist.h> #include <qmediaplaylist.h>
#include <QtGui> #include <QtWidgets>
Player::Player(QWidget *parent) Player::Player(QWidget *parent)

2
examples/player/player.h
View File

@@ -41,7 +41,7 @@
#ifndef PLAYER_H #ifndef PLAYER_H
#define PLAYER_H #define PLAYER_H
#include <QtGui/QWidget> #include <QtWidgets/QWidget>
#include <qmediaplayer.h> #include <qmediaplayer.h>
#include <qmediaplaylist.h> #include <qmediaplaylist.h>

1
examples/player/player.pro
View File

@@ -29,3 +29,4 @@ sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/player sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/player
INSTALLS += target sources INSTALLS += target sources
QT+=widgets

10
examples/player/playercontrols.cpp
View File

@@ -40,11 +40,11 @@
#include "playercontrols.h" #include "playercontrols.h"
#include <QtGui/qboxlayout.h> #include <QtWidgets/qboxlayout.h>
#include <QtGui/qslider.h> #include <QtWidgets/qslider.h>
#include <QtGui/qstyle.h> #include <QtWidgets/qstyle.h>
#include <QtGui/qtoolbutton.h> #include <QtWidgets/qtoolbutton.h>
#include <QtGui/qcombobox.h> #include <QtWidgets/qcombobox.h>
PlayerControls::PlayerControls(QWidget *parent) PlayerControls::PlayerControls(QWidget *parent)
: QWidget(parent) : QWidget(parent)

2
examples/player/playercontrols.h
View File

@@ -43,7 +43,7 @@
#include <qmediaplayer.h> #include <qmediaplayer.h>
#include <QtGui/qwidget.h> #include <QtWidgets/qwidget.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QAbstractButton; class QAbstractButton;

2
examples/player/videowidget.cpp
View File

@@ -40,7 +40,7 @@
#include "videowidget.h" #include "videowidget.h"
#include <QtGui> #include <QtWidgets>
VideoWidget::VideoWidget(QWidget *parent) VideoWidget::VideoWidget(QWidget *parent)
: QVideoWidget(parent) : QVideoWidget(parent)

2
examples/radio/main.cpp
View File

@@ -40,7 +40,7 @@
#include "radio.h" #include "radio.h"
#include <QtGui> #include <QtWidgets>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {

2
examples/radio/radio.cpp
View File

@@ -40,7 +40,7 @@
#include "radio.h" #include "radio.h"
#include <QtGui> #include <QtWidgets>
Radio::Radio() Radio::Radio()
{ {

2
examples/radio/radio.h
View File

@@ -41,7 +41,7 @@
#ifndef RADIO_H #ifndef RADIO_H
#define RADIO_H #define RADIO_H
#include <QtGui> #include <QtWidgets>
#include <qradiotuner.h> #include <qradiotuner.h>

1
examples/radio/radio.pro
View File

@@ -16,3 +16,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/radio
INSTALLS += target sources INSTALLS += target sources
QT+=widgets

2
examples/slideshow/main.cpp
View File

@@ -40,7 +40,7 @@
#include "slideshow.h" #include "slideshow.h"
#include <QtGui> #include <QtWidgets>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {

2
examples/slideshow/slideshow.cpp
View File

@@ -44,7 +44,7 @@
#include <qmediaplaylist.h> #include <qmediaplaylist.h>
#include <qvideowidget.h> #include <qvideowidget.h>
#include <QtGui> #include <QtWidgets>
SlideShow::SlideShow(QWidget *parent) SlideShow::SlideShow(QWidget *parent)
: QMainWindow(parent) : QMainWindow(parent)

1
examples/slideshow/slideshow.pro
View File

@@ -16,3 +16,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/slideshow
INSTALLS += target sources INSTALLS += target sources
QT+=widgets

1
examples/spectrum/app/app.pro
View File

@@ -90,3 +90,4 @@ macx {
} }
QT+=widgets

2
examples/spectrum/app/main.cpp
View File

@@ -38,7 +38,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtGui/QApplication> #include <QtWidgets/QApplication>
#include "mainwidget.h" #include "mainwidget.h"
int main(int argc, char **argv) int main(int argc, char **argv)

1
examples/spectrum/spectrum.pro
View File

@@ -17,3 +17,4 @@ sources.files = README.txt spectrum.pri spectrum.pro TODO.txt
sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/spectrum sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/spectrum
INSTALLS += sources INSTALLS += sources
QT+=widgets

2
examples/videographicsitem/main.cpp
View File

@@ -40,7 +40,7 @@
#include "videoplayer.h" #include "videoplayer.h"
#include <QtGui/QApplication> #include <QtWidgets/QApplication>
int main(int argc, char **argv) int main(int argc, char **argv)
{ {

1
examples/videographicsitem/videographicsitem.pro
View File

@@ -18,3 +18,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videographicsitem
INSTALLS += target sources INSTALLS += target sources
QT+=widgets

2
examples/videographicsitem/videoitem.cpp
View File

@@ -40,7 +40,7 @@
#include "videoitem.h" #include "videoitem.h"
#include <QtGui> #include <QtWidgets>
#include <qvideosurfaceformat.h> #include <qvideosurfaceformat.h>
VideoItem::VideoItem(QGraphicsItem *parent) VideoItem::VideoItem(QGraphicsItem *parent)

2
examples/videographicsitem/videoitem.h
View File

@@ -42,7 +42,7 @@
#define VIDEOITEM_H #define VIDEOITEM_H
#include <qabstractvideosurface.h> #include <qabstractvideosurface.h>
#include <QtGui/QGraphicsItem> #include <QtWidgets/QGraphicsItem>
class VideoItem class VideoItem
: public QAbstractVideoSurface, : public QAbstractVideoSurface,

2
examples/videographicsitem/videoplayer.cpp
View File

@@ -41,7 +41,7 @@
#include "videoplayer.h" #include "videoplayer.h"
#include "videoitem.h" #include "videoitem.h"
#include <QtGui> #include <QtWidgets>
#include <qvideosurfaceformat.h> #include <qvideosurfaceformat.h>
#if !defined(QT_NO_OPENGL) #if !defined(QT_NO_OPENGL)

2
examples/videographicsitem/videoplayer.h
View File

@@ -44,7 +44,7 @@
#include <qmediaplayer.h> #include <qmediaplayer.h>
#include <QtGui/QMovie> #include <QtGui/QMovie>
#include <QtGui/QWidget> #include <QtWidgets/QWidget>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QAbstractButton; class QAbstractButton;

2
examples/videowidget/main.cpp
View File

@@ -40,7 +40,7 @@
#include "videoplayer.h" #include "videoplayer.h"
#include <QtGui/QApplication> #include <QtWidgets/QApplication>
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {

2
examples/videowidget/videoplayer.cpp
View File

@@ -42,7 +42,7 @@
#include "videowidget.h" #include "videowidget.h"
#include <QtGui> #include <QtWidgets>
#include <qvideosurfaceformat.h> #include <qvideosurfaceformat.h>
VideoPlayer::VideoPlayer(QWidget *parent) VideoPlayer::VideoPlayer(QWidget *parent)

2
examples/videowidget/videoplayer.h
View File

@@ -44,7 +44,7 @@
#include <qmediaplayer.h> #include <qmediaplayer.h>
#include <QtGui/QMovie> #include <QtGui/QMovie>
#include <QtGui/QWidget> #include <QtWidgets/QWidget>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QAbstractButton; class QAbstractButton;

2
examples/videowidget/videowidget.cpp
View File

@@ -42,7 +42,7 @@
#include "videowidgetsurface.h" #include "videowidgetsurface.h"
#include <QtGui> #include <QtWidgets>
#include <qvideosurfaceformat.h> #include <qvideosurfaceformat.h>
//! [0] //! [0]

2
examples/videowidget/videowidget.h
View File

@@ -43,7 +43,7 @@
#include "videowidgetsurface.h" #include "videowidgetsurface.h"
#include <QtGui/QWidget> #include <QtWidgets/QWidget>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QAbstractVideoSurface; class QAbstractVideoSurface;

1
examples/videowidget/videowidget.pro
View File

@@ -20,3 +20,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimediakit/videowidget
INSTALLS += target sources INSTALLS += target sources
QT+=widgets

2
examples/videowidget/videowidgetsurface.cpp
View File

@@ -40,7 +40,7 @@
#include "videowidgetsurface.h" #include "videowidgetsurface.h"
#include <QtGui> #include <QtWidgets>
#include <qabstractvideosurface.h> #include <qabstractvideosurface.h>
#include <qvideosurfaceformat.h> #include <qvideosurfaceformat.h>

2
src/multimediakit/effects/qsoundeffect_qsound_p.cpp
View File

@@ -53,7 +53,7 @@
#include "qsoundeffect_qsound_p.h" #include "qsoundeffect_qsound_p.h"
#include <QtCore/qcoreapplication.h> #include <QtCore/qcoreapplication.h>
#include <QtGui/qsound.h> #include <QtWidgets/qsound.h>
#include <QtCore/qstringlist.h> #include <QtCore/qstringlist.h>

3
src/multimediakit/multimediakit.pro
View File

@@ -3,13 +3,12 @@ load(qt_module)
# distinct from QtMultimedia # distinct from QtMultimedia
TARGET = QtMultimediaKit TARGET = QtMultimediaKit
QPRO_PWD = $$PWD QPRO_PWD = $$PWD
QT = core network gui widgets QT = core network gui
CONFIG += module CONFIG += module
MODULE_PRI += ../../modules/qt_multimediakit.pri MODULE_PRI += ../../modules/qt_multimediakit.pri
contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) { contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
QT += opengl
} else { } else {
DEFINES += QT_NO_OPENGL DEFINES += QT_NO_OPENGL
} }

2
src/multimediakitwidgets/qeglimagetexturesurface.cpp
View File

@@ -46,7 +46,7 @@
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtGui/qpainter.h> #include <QtGui/qpainter.h>
#include <QtGui/qx11info_x11.h> #include <QtWidgets/qx11info_x11.h>
#include <qvideosurfaceformat.h> #include <qvideosurfaceformat.h>

2
src/multimediakitwidgets/qgraphicsvideoitem_maemo6.cpp
View File

@@ -45,7 +45,7 @@
#include <QtCore/qpointer.h> #include <QtCore/qpointer.h>
#include <QtCore/qbasictimer.h> #include <QtCore/qbasictimer.h>
#include <QtGui/qgraphicsscene.h> #include <QtWidgets/qgraphicsscene.h>
#include <qmediaobject.h> #include <qmediaobject.h>
#include <qmediaservice.h> #include <qmediaservice.h>

2
src/plugins/directshow/camera/dscameraservice.cpp
View File

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

2
src/plugins/directshow/camera/dsvideodevicecontrol.cpp
View File

@@ -41,7 +41,7 @@
#include <QDebug> #include <QDebug>
#include <QFile> #include <QFile>
#include <QtGui/QIcon> #include <QtWidgets/QIcon>
#include "dsvideodevicecontrol.h" #include "dsvideodevicecontrol.h"
#include "dscamerasession.h" #include "dscamerasession.h"

2
src/plugins/directshow/camera/dsvideowidgetcontrol.h
View File

@@ -43,7 +43,7 @@
#define DSVIDEOWIDGETCONTROL_H #define DSVIDEOWIDGETCONTROL_H
#include <QtCore/qobject.h> #include <QtCore/qobject.h>
#include <QtGui> #include <QtWidgets>
#include <QtMultimedia/qvideoframe.h> #include <QtMultimedia/qvideoframe.h>
#include <QtMultimedia/qabstractvideosurface.h> #include <QtMultimedia/qabstractvideosurface.h>
#include <QtMultimedia/qvideosurfaceformat.h> #include <QtMultimedia/qvideosurfaceformat.h>

4
src/plugins/gstreamer/camerabuttonlistener_meego.cpp
View File

@@ -41,9 +41,9 @@
#include "camerabuttonlistener_meego.h" #include "camerabuttonlistener_meego.h"
#include <QtGui/qapplication.h> #include <QtWidgets/qapplication.h>
#include <QtGui/qevent.h> #include <QtGui/qevent.h>
#include <QtGui/qwidget.h> #include <QtWidgets/qwidget.h>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
CameraButtonListener::CameraButtonListener(QObject *parent) : CameraButtonListener::CameraButtonListener(QObject *parent) :

4
src/plugins/gstreamer/qgstreamergltexturerenderer.cpp
View File

@@ -44,8 +44,8 @@
#include "qgstutils.h" #include "qgstutils.h"
#include <QtGui/qevent.h> #include <QtGui/qevent.h>
#include <QtGui/qapplication.h> #include <QtWidgets/qapplication.h>
#include <QtGui/qx11info_x11.h> #include <QtWidgets/qx11info_x11.h>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtCore/qthread.h> #include <QtCore/qthread.h>

2
src/plugins/gstreamer/qgstreamervideowidget.cpp
View File

@@ -44,7 +44,7 @@
#include <QtCore/qcoreevent.h> #include <QtCore/qcoreevent.h>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtGui/qapplication.h> #include <QtWidgets/qapplication.h>
#include <QtGui/qpainter.h> #include <QtGui/qpainter.h>
#ifdef Q_WS_X11 #ifdef Q_WS_X11

2
src/plugins/gstreamer/qgstxvimagebuffer.cpp
View File

@@ -42,7 +42,7 @@
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtCore/qthread.h> #include <QtCore/qthread.h>
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>
#include <QtGui/qx11info_x11.h> #include <QtWidgets/qx11info_x11.h>
#include "qgstxvimagebuffer.h" #include "qgstxvimagebuffer.h"
#include "qvideosurfacegstsink.h" #include "qvideosurfacegstsink.h"

2
src/plugins/gstreamer/qvideosurfacegstsink.cpp
View File

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

2
src/plugins/gstreamer/qx11videosurface.cpp
View File

@@ -41,7 +41,7 @@
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtGui/qx11info_x11.h> #include <QtWidgets/qx11info_x11.h>
#include <qvideosurfaceformat.h> #include <qvideosurfaceformat.h>
#ifndef QT_NO_XVIDEO #ifndef QT_NO_XVIDEO

2
src/plugins/gstreamer/qx11videosurface.h
View File

@@ -42,7 +42,7 @@
#ifndef QX11VIDEOSURFACE_H #ifndef QX11VIDEOSURFACE_H
#define QX11VIDEOSURFACE_H #define QX11VIDEOSURFACE_H
#include <QtGui/qwidget.h> #include <QtWidgets/qwidget.h>
#include <qabstractvideosurface.h> #include <qabstractvideosurface.h>
#ifndef QT_NO_XVIDEO #ifndef QT_NO_XVIDEO

2
src/plugins/qt7/mediaplayer/qt7playercontrol.h
View File

@@ -47,7 +47,7 @@
#include <qmediaplayercontrol.h> #include <qmediaplayercontrol.h>
#include <qmediaplayer.h> #include <qmediaplayer.h>
#include <QtGui/qmacdefines_mac.h> #include <QtWidgets/qmacdefines_mac.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/plugins/qt7/mediaplayer/qt7playersession.h
View File

@@ -50,7 +50,7 @@
#include <qmediaplayercontrol.h> #include <qmediaplayercontrol.h>
#include <qmediaplayer.h> #include <qmediaplayer.h>
#include <QtGui/qmacdefines_mac.h> #include <QtWidgets/qmacdefines_mac.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/plugins/qt7/qt7movierenderer.h
View File

@@ -50,7 +50,7 @@
#include <qvideorenderercontrol.h> #include <qvideorenderercontrol.h>
#include <qmediaplayer.h> #include <qmediaplayer.h>
#include <QtGui/qmacdefines_mac.h> #include <QtWidgets/qmacdefines_mac.h>
#include "qt7videooutput.h" #include "qt7videooutput.h"
#include <QuartzCore/CVOpenGLTexture.h> #include <QuartzCore/CVOpenGLTexture.h>

2
src/plugins/qt7/qt7movievideowidget.h
View File

@@ -48,7 +48,7 @@
#include <qvideowindowcontrol.h> #include <qvideowindowcontrol.h>
#include <qmediaplayer.h> #include <qmediaplayer.h>
#include <QtGui/qmacdefines_mac.h> #include <QtWidgets/qmacdefines_mac.h>
#include "qt7videooutput.h" #include "qt7videooutput.h"
#include <QuartzCore/CVOpenGLTexture.h> #include <QuartzCore/CVOpenGLTexture.h>

2
src/plugins/qt7/qt7movieviewoutput.h
View File

@@ -47,7 +47,7 @@
#include <qvideowindowcontrol.h> #include <qvideowindowcontrol.h>
#include <qmediaplayer.h> #include <qmediaplayer.h>
#include <QtGui/qmacdefines_mac.h> #include <QtWidgets/qmacdefines_mac.h>
#include "qt7videooutput.h" #include "qt7videooutput.h"

2
src/plugins/qt7/qt7movieviewrenderer.h
View File

@@ -48,7 +48,7 @@
#include <qvideowindowcontrol.h> #include <qvideowindowcontrol.h>
#include <qmediaplayer.h> #include <qmediaplayer.h>
#include <QtGui/qmacdefines_mac.h> #include <QtWidgets/qmacdefines_mac.h>
#include "qt7videooutput.h" #include "qt7videooutput.h"
#include <qvideoframe.h> #include <qvideoframe.h>

2
src/plugins/qt7/qt7videooutput.h
View File

@@ -50,7 +50,7 @@
#include <qvideorenderercontrol.h> #include <qvideorenderercontrol.h>
#include <qmediaplayer.h> #include <qmediaplayer.h>
#include <QtGui/qmacdefines_mac.h> #include <QtWidgets/qmacdefines_mac.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/plugins/simulator/camera/simulatorvideoinputdevicecontrol.cpp
View File

@@ -41,7 +41,7 @@
#include "simulatorvideoinputdevicecontrol.h" #include "simulatorvideoinputdevicecontrol.h"
#include <QtGui/QIcon> #include <QtWidgets/QIcon>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtCore/QStringList> #include <QtCore/QStringList>

2
src/plugins/simulator/qsimulatorserviceplugin.cpp
View File

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

2
src/plugins/v4l/radio/v4lradioservice.cpp
View File

@@ -42,7 +42,7 @@
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
#include <QtCore/qfile.h> #include <QtCore/qfile.h>
#include <QtGui/qwidget.h> #include <QtWidgets/qwidget.h>
#include "v4lradioservice.h" #include "v4lradioservice.h"
#include "v4lradiocontrol.h" #include "v4lradiocontrol.h"

2
tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
View File

@@ -51,7 +51,7 @@
#include <qmediaserviceprovider.h> #include <qmediaserviceprovider.h>
#include <qmetadatareadercontrol.h> #include <qmetadatareadercontrol.h>
#include <QtGui/qapplication.h> #include <QtWidgets/qapplication.h>
class tst_QDeclarativeAudio : public QObject class tst_QDeclarativeAudio : public QObject
{ {

2
tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp
View File

@@ -55,7 +55,7 @@
#include <qvideowindowcontrol.h> #include <qvideowindowcontrol.h>
#include <qvideosurfaceformat.h> #include <qvideosurfaceformat.h>
#include <QtGui/qapplication.h> #include <QtWidgets/qapplication.h>
#include <QtGui/qpainter.h> #include <QtGui/qpainter.h>
class tst_QDeclarativeVideo : public QObject class tst_QDeclarativeVideo : public QObject

6
tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
View File

@@ -52,9 +52,9 @@
#include <qabstractvideosurface.h> #include <qabstractvideosurface.h>
#include <qvideosurfaceformat.h> #include <qvideosurfaceformat.h>
#include <QtGui/qapplication.h> #include <QtWidgets/qapplication.h>
#include <QtGui/qgraphicsscene.h> #include <QtWidgets/qgraphicsscene.h>
#include <QtGui/qgraphicsview.h> #include <QtWidgets/qgraphicsview.h>
QT_USE_NAMESPACE QT_USE_NAMESPACE
class tst_QGraphicsVideoItem : public QObject class tst_QGraphicsVideoItem : public QObject

1
tests/auto/qmediaservice/qmediaservice.pro
View File

@@ -4,4 +4,3 @@ QT += multimediakit-private
CONFIG += no_private_qt_headers_warning CONFIG += no_private_qt_headers_warning
SOURCES += tst_qmediaservice.cpp SOURCES += tst_qmediaservice.cpp

3
tests/auto/qmediaservice/tst_qmediaservice.cpp
View File

@@ -47,8 +47,7 @@
#include <qmediacontrol.h> #include <qmediacontrol.h>
#include <qmediaservice.h> #include <qmediaservice.h>
#include <QtGui/qapplication.h> #include <QtCore/qcoreapplication.h>
#include <QtGui/qstyle.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp
View File

@@ -44,7 +44,7 @@
#include <private/qpaintervideosurface_p.h> #include <private/qpaintervideosurface_p.h>
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtGui/qapplication.h> #include <QtWidgets/qapplication.h>
#include <qvideosurfaceformat.h> #include <qvideosurfaceformat.h>
#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1) #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1)

2
tests/auto/qvideoframe/tst_qvideoframe.cpp
View File

@@ -650,7 +650,7 @@ void tst_QVideoFrame::mapImage()
QVERIFY(frame.map(mode)); QVERIFY(frame.map(mode));
QVERIFY(frame.bits()); QVERIFY(frame.bits());
QCOMPARE(frame.mappedBytes(), image.numBytes()); QCOMPARE(frame.mappedBytes(), image.byteCount());
QCOMPARE(frame.bytesPerLine(), image.bytesPerLine()); QCOMPARE(frame.bytesPerLine(), image.bytesPerLine());
QCOMPARE(frame.mapMode(), mode); QCOMPARE(frame.mapMode(), mode);

2
tests/auto/qvideowidget/tst_qvideowidget.cpp
View File

@@ -56,7 +56,7 @@
#include <qabstractvideosurface.h> #include <qabstractvideosurface.h>
#include <qvideosurfaceformat.h> #include <qvideosurfaceformat.h>
#include <QtGui/qapplication.h> #include <QtWidgets/qapplication.h>
QT_USE_NAMESPACE QT_USE_NAMESPACE
class tst_QVideoWidget : public QObject class tst_QVideoWidget : public QObject