Merge remote-tracking branch 'origin/5.5.0' into 5.5

Change-Id: I5a5b387b93a4b9dbaa9710e78fd7bf1ca09aa3b3
2015-06-26 14:04:32 +02:00
parent dc9e10d4b7 04e086e336
commit fb000c9ecb
22 changed files with 240 additions and 44 deletions
--- a/src/plugins/winrt/qwinrtcameraservice.cpp
+++ b/src/plugins/winrt/qwinrtcameraservice.cpp
@@ -46,7 +46,7 @@
 #include <QtMultimedia/QVideoDeviceSelectorControl>
 #include <QtMultimedia/QImageEncoderControl>

-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE

 class QWinRTCameraServicePrivate
 {
@@ -103,3 +103,5 @@ void QWinRTCameraService::releaseControl(QMediaControl *control)
 {
    Q_UNUSED(control);
 }
+
+QT_END_NAMESPACE