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/multimediawidgets | |
parent | 48d95f0baac39fc5eb38a137a8e84eda2cdb2b79 (diff) | |
download | qtmultimedia-930d99948f3e2266e7093b0c85eaa0ff38218202.tar.gz |
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/multimediawidgets')
-rw-r--r-- | src/multimediawidgets/qcameraviewfinder.cpp | 10 | ||||
-rw-r--r-- | src/multimediawidgets/qcameraviewfinder.h | 2 | ||||
-rw-r--r-- | src/multimediawidgets/qgraphicsvideoitem.cpp | 5 | ||||
-rw-r--r-- | src/multimediawidgets/qgraphicsvideoitem.h | 2 | ||||
-rw-r--r-- | src/multimediawidgets/qpaintervideosurface.cpp | 4 | ||||
-rw-r--r-- | src/multimediawidgets/qtmultimediawidgetdefs.h | 2 | ||||
-rw-r--r-- | src/multimediawidgets/qvideowidget.cpp | 2 | ||||
-rw-r--r-- | src/multimediawidgets/qvideowidget.h | 2 | ||||
-rw-r--r-- | src/multimediawidgets/qvideowidgetcontrol.h | 2 | ||||
-rw-r--r-- | src/multimediawidgets/qvideowindowcontrol.h | 2 |
10 files changed, 16 insertions, 17 deletions
diff --git a/src/multimediawidgets/qcameraviewfinder.cpp b/src/multimediawidgets/qcameraviewfinder.cpp index 1d3f18549..91a90830d 100644 --- a/src/multimediawidgets/qcameraviewfinder.cpp +++ b/src/multimediawidgets/qcameraviewfinder.cpp @@ -39,14 +39,14 @@ ** ****************************************************************************/ -#include <QDebug> - -#include <private/qmediaobject_p.h> +#include "qcameraviewfinder.h" +#include "qvideowidget_p.h" #include <qcamera.h> -#include <qcameraviewfinder.h> -#include <qvideowidget_p.h> #include <qvideodevicecontrol.h> +#include <private/qmediaobject_p.h> + +#include <QtCore/QDebug> QT_USE_NAMESPACE diff --git a/src/multimediawidgets/qcameraviewfinder.h b/src/multimediawidgets/qcameraviewfinder.h index 4ac39ebb9..f1ab3f29e 100644 --- a/src/multimediawidgets/qcameraviewfinder.h +++ b/src/multimediawidgets/qcameraviewfinder.h @@ -65,7 +65,7 @@ QT_MODULE(Multimedia) class QCamera; class QCameraViewfinderPrivate; -class Q_MULTIMEDIA_EXPORT QCameraViewfinder : public QVideoWidget +class Q_MULTIMEDIAWIDGETS_EXPORT QCameraViewfinder : public QVideoWidget { Q_OBJECT public: diff --git a/src/multimediawidgets/qgraphicsvideoitem.cpp b/src/multimediawidgets/qgraphicsvideoitem.cpp index 120a24f26..c92fb1ef5 100644 --- a/src/multimediawidgets/qgraphicsvideoitem.cpp +++ b/src/multimediawidgets/qgraphicsvideoitem.cpp @@ -40,17 +40,16 @@ ****************************************************************************/ #include "qgraphicsvideoitem.h" +#include "qpaintervideosurface_p.h" #include <qmediaobject.h> #include <qmediaservice.h> -#include <qpaintervideosurface_p.h> #include <qvideorenderercontrol.h> +#include <qvideosurfaceformat.h> #include <QtCore/qcoreevent.h> #include <QtCore/qpointer.h> -#include <qvideosurfaceformat.h> - #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1) #include <QtOpenGL/qgl.h> #endif diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h index cf8913417..c92d42d31 100644 --- a/src/multimediawidgets/qgraphicsvideoitem.h +++ b/src/multimediawidgets/qgraphicsvideoitem.h @@ -59,7 +59,7 @@ QT_END_NAMESPACE QT_BEGIN_NAMESPACE class QGraphicsVideoItemPrivate; -class Q_MULTIMEDIA_EXPORT QGraphicsVideoItem : public QGraphicsObject, public QMediaBindableInterface +class Q_MULTIMEDIAWIDGETS_EXPORT QGraphicsVideoItem : public QGraphicsObject, public QMediaBindableInterface { Q_OBJECT Q_INTERFACES(QMediaBindableInterface) diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp index bd82f7841..8c31dd5d9 100644 --- a/src/multimediawidgets/qpaintervideosurface.cpp +++ b/src/multimediawidgets/qpaintervideosurface.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <qpaintervideosurface_p.h> -#include <qpaintervideosurface_mac_p.h> +#include "qpaintervideosurface_p.h" +#include "qpaintervideosurface_mac_p.h" #include <qmath.h> diff --git a/src/multimediawidgets/qtmultimediawidgetdefs.h b/src/multimediawidgets/qtmultimediawidgetdefs.h index 57ce226a1..0816d472a 100644 --- a/src/multimediawidgets/qtmultimediawidgetdefs.h +++ b/src/multimediawidgets/qtmultimediawidgetdefs.h @@ -65,7 +65,7 @@ QT_BEGIN_HEADER # if defined(QT_DLL) # undef QT_DLL # endif -# if defined(QT_BUILD_MULTIMEDIA_LIB) +# if defined(QT_BUILD_MULTIMEDIAWIDGETS_LIB) # define Q_MULTIMEDIAWIDGETS_EXPORT Q_DECL_EXPORT # else # define Q_MULTIMEDIAWIDGETS_EXPORT Q_DECL_IMPORT diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp index f31144cb0..919ed1fac 100644 --- a/src/multimediawidgets/qvideowidget.cpp +++ b/src/multimediawidgets/qvideowidget.cpp @@ -40,13 +40,13 @@ ****************************************************************************/ #include "qvideowidget_p.h" +#include "qpaintervideosurface_p.h" #include <qmediaobject.h> #include <qmediaservice.h> #include <qvideowindowcontrol.h> #include <qvideowidgetcontrol.h> -#include <qpaintervideosurface_p.h> #include <qvideorenderercontrol.h> #include <qvideosurfaceformat.h> #include <qpainter.h> diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h index c4c6f8d3f..b9d2cfed6 100644 --- a/src/multimediawidgets/qvideowidget.h +++ b/src/multimediawidgets/qvideowidget.h @@ -57,7 +57,7 @@ QT_MODULE(Multimedia) class QMediaObject; class QVideoWidgetPrivate; -class Q_MULTIMEDIA_EXPORT QVideoWidget : public QWidget, public QMediaBindableInterface +class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWidget : public QWidget, public QMediaBindableInterface { Q_OBJECT Q_INTERFACES(QMediaBindableInterface) diff --git a/src/multimediawidgets/qvideowidgetcontrol.h b/src/multimediawidgets/qvideowidgetcontrol.h index c5ac880fa..41a02ddfd 100644 --- a/src/multimediawidgets/qvideowidgetcontrol.h +++ b/src/multimediawidgets/qvideowidgetcontrol.h @@ -56,7 +56,7 @@ QT_MODULE(Multimedia) class QVideoWidgetControlPrivate; -class Q_MULTIMEDIA_EXPORT QVideoWidgetControl : public QMediaControl +class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWidgetControl : public QMediaControl { Q_OBJECT diff --git a/src/multimediawidgets/qvideowindowcontrol.h b/src/multimediawidgets/qvideowindowcontrol.h index 590ce64be..f8e1c6378 100644 --- a/src/multimediawidgets/qvideowindowcontrol.h +++ b/src/multimediawidgets/qvideowindowcontrol.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) -class Q_MULTIMEDIA_EXPORT QVideoWindowControl : public QMediaControl +class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWindowControl : public QMediaControl { Q_OBJECT |