diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:06:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:52:58 +0200 |
| commit | 7fdb88a86b0782e7170eefe3dfe7ab3e9c81f847 (patch) | |
| tree | 0fb34738dd5b4abd222ffac7b25f904c456006d9 /src/plugins/directshow/dsserviceplugin.h | |
| parent | badecdbc46df6ada383f1dfd006fa3dfff1706c6 (diff) | |
| parent | a6cc1af0546ab10701c10475315139ebb50ad1e5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I20470ed193e818eefedd975d89f755fb9d673241
Diffstat (limited to 'src/plugins/directshow/dsserviceplugin.h')
| -rw-r--r-- | src/plugins/directshow/dsserviceplugin.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/directshow/dsserviceplugin.h b/src/plugins/directshow/dsserviceplugin.h index b7ac6a86e..f57262e37 100644 --- a/src/plugins/directshow/dsserviceplugin.h +++ b/src/plugins/directshow/dsserviceplugin.h @@ -43,7 +43,7 @@ #include <QtMultimedia/private/qtmultimediaglobal_p.h> #include "qmediaserviceproviderplugin.h" -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class DSServicePlugin : public QMediaServiceProviderPlugin @@ -74,4 +74,6 @@ public: QString deviceDescription(const QByteArray &service, const QByteArray &device); }; +QT_END_NAMESPACE + #endif // DSSERVICEPLUGIN_H |