diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 14:04:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 14:04:32 +0200 |
| commit | fb000c9ecbe612b13119a231054943f1e4bf05e7 (patch) | |
| tree | 864e1fd82f5662263e9952afdff967bd146ce5f0 /src/plugins/winrt/qwinrtcameraservice.cpp | |
| parent | dc9e10d4b7acd9e752a7b094c7178a7ecbe96ff7 (diff) | |
| parent | 04e086e33667ca1a7aa8a7be7427bfba491a72b0 (diff) | |
Merge remote-tracking branch 'origin/5.5.0' into 5.5
Change-Id: I5a5b387b93a4b9dbaa9710e78fd7bf1ca09aa3b3
Diffstat (limited to 'src/plugins/winrt/qwinrtcameraservice.cpp')
| -rw-r--r-- | src/plugins/winrt/qwinrtcameraservice.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/winrt/qwinrtcameraservice.cpp b/src/plugins/winrt/qwinrtcameraservice.cpp index dc9d6ee67..be67b4742 100644 --- 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 |