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/qwinrtcameraimagecapturecontrol.cpp
+++ b/src/plugins/winrt/qwinrtcameraimagecapturecontrol.cpp
@@ -65,7 +65,7 @@ using namespace ABI::Windows::Media::MediaProperties;
 using namespace ABI::Windows::Storage::Streams;
 using namespace ABI::Windows::Graphics::Imaging;

-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE

 #define wchar(str) reinterpret_cast<const wchar_t *>(str.utf16())

@@ -299,3 +299,5 @@ HRESULT QWinRTCameraImageCaptureControl::onCaptureCompleted(IAsyncAction *asyncI

    return S_OK;
 }
+
+QT_END_NAMESPACE