diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-12 08:53:21 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-12 09:00:27 +0200 |
| commit | 930d99948f3e2266e7093b0c85eaa0ff38218202 (patch) | |
| tree | 2e967ac792f6f6ce0c85146ed7b30698faf8ff85 /src/multimedia/qmediaplayer.cpp | |
| parent | 48d95f0baac39fc5eb38a137a8e84eda2cdb2b79 (diff) | |
Multimedia: Compile on Windows.
MSVC is more strict about #include <> and #include "".
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Change-Id: I8973d7b2717d892407ad93785f92a64b05bdb6b5
Reviewed-on: http://codereview.qt-project.org/6134
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/multimedia/qmediaplayer.cpp')
| -rw-r--r-- | src/multimedia/qmediaplayer.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/multimedia/qmediaplayer.cpp b/src/multimedia/qmediaplayer.cpp index 5d5a7a7..312122d 100644 --- a/src/multimedia/qmediaplayer.cpp +++ b/src/multimedia/qmediaplayer.cpp @@ -39,25 +39,25 @@ ** ****************************************************************************/ -#include <QtCore/qcoreevent.h> -#include <QtCore/qmetaobject.h> -#include <QtCore/qtimer.h> -#include <QtCore/qdebug.h> -#include <QtCore/qpointer.h> - - #include "qmediaplayer.h" +#include "qvideosurfaceoutput_p.h" -#include <qmediaobject_p.h> +#include "qmediaobject_p.h" #include <qmediaservice.h> #include <qmediaplayercontrol.h> #include <qmediaserviceprovider.h> #include <qmediaplaylist.h> #include <qmediaplaylistcontrol.h> #include <qmediaplaylistsourcecontrol.h> -#include <qvideosurfaceoutput_p.h> + #include <qmedianetworkaccesscontrol.h> +#include <QtCore/qcoreevent.h> +#include <QtCore/qmetaobject.h> +#include <QtCore/qtimer.h> +#include <QtCore/qdebug.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE /*! |