diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/recording/qmediarecorder.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/directshow/camera/camera.pri | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp index bfbd04268..3c66d053e 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp +++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp @@ -309,7 +309,7 @@ void QAudioDeviceInfoInternal::updateLists() { // redo all lists based on current settings bool match = false; - DWORD fmt = NULL; + DWORD fmt = 0; if(mode == QAudio::AudioOutput) { WAVEOUTCAPS woc; diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp index fba8387d8..e6bbcdd7e 100644 --- a/src/multimedia/recording/qmediarecorder.cpp +++ b/src/multimedia/recording/qmediarecorder.cpp @@ -188,7 +188,8 @@ void QMediaRecorderPrivate::_q_applySettings() void QMediaRecorderPrivate::_q_availabilityChanged(QtMultimedia::AvailabilityStatus availability) { Q_Q(QMediaRecorder); - Q_UNUSED(error); + Q_UNUSED(error) + Q_UNUSED(availability) // Really this should not always emit, but // we can't really tell from here (isAvailable diff --git a/src/plugins/directshow/camera/camera.pri b/src/plugins/directshow/camera/camera.pri index 83b681920..b576a852f 100644 --- a/src/plugins/directshow/camera/camera.pri +++ b/src/plugins/directshow/camera/camera.pri @@ -13,7 +13,6 @@ HEADERS += \ $$PWD/dsvideodevicecontrol.h \ $$PWD/dsimagecapturecontrol.h \ $$PWD/dscamerasession.h \ - $$PWD/dscameraservice.h \ $$PWD/directshowglobal.h SOURCES += \ |