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/qcamera.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/qcamera.cpp')
| -rw-r--r-- | src/multimedia/qcamera.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/qcamera.cpp b/src/multimedia/qcamera.cpp index 2b18726..fd1fe5b 100644 --- a/src/multimedia/qcamera.cpp +++ b/src/multimedia/qcamera.cpp @@ -39,11 +39,10 @@ ** ****************************************************************************/ -#include <QDebug> +#include "qvideosurfaceoutput_p.h" +#include "qmediaobject_p.h" #include <qcamera.h> - -#include <qmediaobject_p.h> #include <qcameracontrol.h> #include <qcameralockscontrol.h> #include <qcameraexposurecontrol.h> @@ -52,7 +51,8 @@ #include <qcameraimageprocessingcontrol.h> #include <qcameraimagecapturecontrol.h> #include <qvideodevicecontrol.h> -#include <qvideosurfaceoutput_p.h> + +#include <QDebug> QT_USE_NAMESPACE |