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/imports/multimedia | |
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/imports/multimedia')
-rw-r--r-- | src/imports/multimedia/qdeclarativecamera_p.h | 13 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecameracapture_p.h | 2 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecameraexposure_p.h | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h index a96dd6e67..7004f7e58 100644 --- a/src/imports/multimedia/qdeclarativecamera_p.h +++ b/src/imports/multimedia/qdeclarativecamera_p.h @@ -53,16 +53,17 @@ // We mean it. // -#include <QtCore/qbasictimer.h> -#include <QtCore/qdatetime.h> -#include <QtDeclarative/qdeclarative.h> -#include <QtDeclarative/qdeclarativeparserstatus.h> +#include "qdeclarativecameracapture_p.h" +#include "qdeclarativecamerarecorder_p.h" #include <qcamera.h> #include <qcameraimageprocessing.h> #include <qcameraimagecapture.h> -#include <qdeclarativecameracapture_p.h> -#include <qdeclarativecamerarecorder_p.h> + +#include <QtCore/qbasictimer.h> +#include <QtCore/qdatetime.h> +#include <QtDeclarative/qdeclarative.h> +#include <QtDeclarative/qdeclarativeparserstatus.h> QT_BEGIN_HEADER diff --git a/src/imports/multimedia/qdeclarativecameracapture_p.h b/src/imports/multimedia/qdeclarativecameracapture_p.h index ec464a098..6effa74e2 100644 --- a/src/imports/multimedia/qdeclarativecameracapture_p.h +++ b/src/imports/multimedia/qdeclarativecameracapture_p.h @@ -57,6 +57,8 @@ #include <qcameraimagecapture.h> #include <qmediaencodersettings.h> +#include <QtDeclarative/qdeclarative.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/imports/multimedia/qdeclarativecameraexposure_p.h b/src/imports/multimedia/qdeclarativecameraexposure_p.h index d4411ad54..677d963c3 100644 --- a/src/imports/multimedia/qdeclarativecameraexposure_p.h +++ b/src/imports/multimedia/qdeclarativecameraexposure_p.h @@ -53,9 +53,9 @@ // We mean it. // +#include "qdeclarativecamera_p.h" #include <qcamera.h> #include <qcameraexposure.h> -#include <qdeclarativecamera_p.h> QT_BEGIN_HEADER |