diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-30 03:00:10 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-07-30 12:21:51 +0200 |
| commit | 3f17e216c9c75c667ab501a59bcb96be62e3afa1 (patch) | |
| tree | 7e20d31bae96154abd2b10e43fdfbc4f0d284c77 /src/plugins/directshow/camera/dscamerasession.cpp | |
| parent | 3f12e848168f61f986f2809cd7f8dac75408548f (diff) | |
| parent | dbdcc1b099dc25ffb707a2441191463de33c51f3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I329eeefafed87ff7467d21d5d099cf9897660167
Diffstat (limited to 'src/plugins/directshow/camera/dscamerasession.cpp')
| -rw-r--r-- | src/plugins/directshow/camera/dscamerasession.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp index 27cdd84db..a0c120816 100644 --- a/src/plugins/directshow/camera/dscamerasession.cpp +++ b/src/plugins/directshow/camera/dscamerasession.cpp @@ -59,8 +59,8 @@ QT_BEGIN_NAMESPACE DSCameraSession::DSCameraSession(QObject *parent) : QObject(parent) { - connect(this, SIGNAL(statusChanged(QCamera::Status)), - this, SLOT(updateReadyForCapture())); + connect(this, &DSCameraSession::statusChanged, + this, &DSCameraSession::updateReadyForCapture); m_deviceLostEventTimer.setSingleShot(true); connect(&m_deviceLostEventTimer, &QTimer::timeout, [&]() { @@ -690,7 +690,7 @@ bool DSCameraSession::createFilterGraph() IEnumMoniker* pEnum = nullptr; // Create the filter graph - hr = CoCreateInstance(CLSID_FilterGraph,nullptr,CLSCTX_INPROC, + hr = CoCreateInstance(CLSID_FilterGraph, nullptr, CLSCTX_INPROC, IID_IGraphBuilder, reinterpret_cast<void**>(&m_filterGraph)); if (FAILED(hr)) { errorString = tr("Failed to create filter graph"); |