diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-14 15:35:32 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-17 03:24:15 +0200 |
commit | eedcc340f1c1e8bb09759946a4b2c241e219cc58 (patch) | |
tree | 82bccd0f8ec9b61027254795616efdaa31620e50 /examples/player | |
parent | 4840be02398041315da8be67041a8cd9152ee8a1 (diff) |
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>
Diffstat (limited to 'examples/player')
-rw-r--r-- | examples/player/main.cpp | 2 | ||||
-rw-r--r-- | examples/player/player.cpp | 2 | ||||
-rw-r--r-- | examples/player/player.h | 2 | ||||
-rw-r--r-- | examples/player/player.pro | 1 | ||||
-rw-r--r-- | examples/player/playercontrols.cpp | 10 | ||||
-rw-r--r-- | examples/player/playercontrols.h | 2 | ||||
-rw-r--r-- | examples/player/videowidget.cpp | 2 |
7 files changed, 11 insertions, 10 deletions
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) |