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/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>