From 930d99948f3e2266e7093b0c85eaa0ff38218202 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 12 Oct 2011 08:53:21 +0200
Subject: 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>
---
 src/imports/multimedia/qdeclarativecamera_p.h         | 13 +++++++------
 src/imports/multimedia/qdeclarativecameracapture_p.h  |  2 ++
 src/imports/multimedia/qdeclarativecameraexposure_p.h |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/imports')

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
 
-- 
cgit v1.2.3