diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-09-29 12:53:09 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 13:02:15 +0200 |
| commit | 7161e2a0201b44ac1577296a37cd1595a468c6c7 (patch) | |
| tree | 319e42211d69b64bc3b1ffae91077ca97e792f75 | |
| parent | ab09b15299c9d6c5efea15c720c9c5888d1d6839 (diff) | |
Phonon: Compile examples.
Change-Id: I95b8cc8b05049ce19b94ff07eddc84e884adb043
Reviewed-on: http://codereview.qt-project.org/5787
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| -rw-r--r-- | examples/phonon/capabilities/capabilities.pro | 2 | ||||
| -rw-r--r-- | examples/phonon/capabilities/main.cpp | 2 | ||||
| -rw-r--r-- | examples/phonon/capabilities/window.cpp | 2 | ||||
| -rw-r--r-- | examples/phonon/capabilities/window.h | 2 | ||||
| -rw-r--r-- | examples/phonon/qmediaplayer/mediaplayer.cpp | 2 | ||||
| -rw-r--r-- | examples/phonon/qmediaplayer/mediaplayer.h | 10 | ||||
| -rw-r--r-- | examples/phonon/qmediaplayer/qmediaplayer.pro | 2 | ||||
| -rw-r--r-- | examples/phonon/qmusicplayer/main.cpp | 2 | ||||
| -rw-r--r-- | examples/phonon/qmusicplayer/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | examples/phonon/qmusicplayer/qmusicplayer.pro | 2 |
10 files changed, 14 insertions, 14 deletions
diff --git a/examples/phonon/capabilities/capabilities.pro b/examples/phonon/capabilities/capabilities.pro index c8b2787..047d5e2 100644 --- a/examples/phonon/capabilities/capabilities.pro +++ b/examples/phonon/capabilities/capabilities.pro @@ -1,4 +1,4 @@ -QT += phonon +QT += phonon widgets HEADERS += window.h SOURCES += window.cpp \ diff --git a/examples/phonon/capabilities/main.cpp b/examples/phonon/capabilities/main.cpp index 37d0a77..3ffa425 100644 --- a/examples/phonon/capabilities/main.cpp +++ b/examples/phonon/capabilities/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QApplication> #include "window.h" diff --git a/examples/phonon/capabilities/window.cpp b/examples/phonon/capabilities/window.cpp index f532107..dc97d4b 100644 --- a/examples/phonon/capabilities/window.cpp +++ b/examples/phonon/capabilities/window.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "window.h" diff --git a/examples/phonon/capabilities/window.h b/examples/phonon/capabilities/window.h index 9ef908f..31892f8 100644 --- a/examples/phonon/capabilities/window.h +++ b/examples/phonon/capabilities/window.h @@ -41,7 +41,7 @@ #ifndef WINDOW_H #define WINDOW_H -#include <QWidget> +#include <QtWidgets/QWidget> #include <phonon/audiooutput.h> #include <phonon/seekslider.h> diff --git a/examples/phonon/qmediaplayer/mediaplayer.cpp b/examples/phonon/qmediaplayer/mediaplayer.cpp index 91f24b7..23bf0e7 100644 --- a/examples/phonon/qmediaplayer/mediaplayer.cpp +++ b/examples/phonon/qmediaplayer/mediaplayer.cpp @@ -39,7 +39,7 @@ ** ***************************************************************************/ -#include <QtGui> +#include <QtWidgets> #define SLIDER_RANGE 8 diff --git a/examples/phonon/qmediaplayer/mediaplayer.h b/examples/phonon/qmediaplayer/mediaplayer.h index 0b9dcf3..00b68f2 100644 --- a/examples/phonon/qmediaplayer/mediaplayer.h +++ b/examples/phonon/qmediaplayer/mediaplayer.h @@ -42,13 +42,13 @@ #ifndef MEDIALAYER_H #define MEDIAPLAYER_H -#include <QtGui/QWidget> -#include <QtGui/QApplication> -#include <QtCore/QTimerEvent> +#include <QtWidgets/QIcon> +#include <QtWidgets/QAction> +#include <QtWidgets/QWidget> +#include <QtWidgets/QApplication> #include <QtGui/QShowEvent> -#include <QtGui/QIcon> #include <QtCore/QBasicTimer> -#include <QtGui/QAction> +#include <QtCore/QTimerEvent> #include <phonon/audiooutput.h> #include <phonon/backendcapabilities.h> diff --git a/examples/phonon/qmediaplayer/qmediaplayer.pro b/examples/phonon/qmediaplayer/qmediaplayer.pro index 901cf5e..eaa9f6c 100644 --- a/examples/phonon/qmediaplayer/qmediaplayer.pro +++ b/examples/phonon/qmediaplayer/qmediaplayer.pro @@ -5,7 +5,7 @@ TEMPLATE = app DEPENDPATH += . build src ui -QT += phonon +QT += phonon widgets FORMS += settings.ui RESOURCES += mediaplayer.qrc diff --git a/examples/phonon/qmusicplayer/main.cpp b/examples/phonon/qmusicplayer/main.cpp index 2c05692..e80d873 100644 --- a/examples/phonon/qmusicplayer/main.cpp +++ b/examples/phonon/qmusicplayer/main.cpp @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets/QApplication> #include "mainwindow.h" diff --git a/examples/phonon/qmusicplayer/mainwindow.cpp b/examples/phonon/qmusicplayer/mainwindow.cpp index b804a72..f6a41a3 100644 --- a/examples/phonon/qmusicplayer/mainwindow.cpp +++ b/examples/phonon/qmusicplayer/mainwindow.cpp @@ -38,7 +38,7 @@ ** ***************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" diff --git a/examples/phonon/qmusicplayer/qmusicplayer.pro b/examples/phonon/qmusicplayer/qmusicplayer.pro index 7af7274..1c3f8de 100644 --- a/examples/phonon/qmusicplayer/qmusicplayer.pro +++ b/examples/phonon/qmusicplayer/qmusicplayer.pro @@ -1,4 +1,4 @@ -QT += phonon +QT += phonon widgets HEADERS += mainwindow.h SOURCES += main.cpp \ |