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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/plugins/directshow/dsserviceplugin.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/directshow/dsserviceplugin.cpp b/src/plugins/directshow/dsserviceplugin.cpp index 9060bac7c..51be7e500 100644 --- a/src/plugins/directshow/dsserviceplugin.cpp +++ b/src/plugins/directshow/dsserviceplugin.cpp @@ -75,9 +75,6 @@ extern const CLSID CLSID_VideoInputDeviceCategory; QT_BEGIN_NAMESPACE Q_LOGGING_CATEGORY(qtDirectShowPlugin, "qt.multimedia.plugins.directshow") -QT_END_NAMESPACE - -QT_USE_NAMESPACE static int g_refCount = 0; void addRefCount() @@ -157,3 +154,5 @@ QString DSServicePlugin::deviceDescription(const QByteArray &service, const QByt } return QString(); } + +QT_END_NAMESPACE |