From c82402e158100d1c755bdcbaab731952ad487821 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Feb 2016 16:23:59 +0100 Subject: consistently put {qt,qml}_{module,plugin} at the end of project files this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I8e1554b648327ea2fb342b882ce8e439bd6f271d Reviewed-by: Yoann Lopes --- src/multimedia/multimedia.pro | 4 ++-- src/multimediawidgets/multimediawidgets.pro | 4 ++-- src/plugins/alsa/alsa.pro | 8 ++++---- src/plugins/android/src/src.pro | 9 +++++---- src/plugins/android/videonode/videonode.pro | 11 ++++++----- src/plugins/audiocapture/audiocapture.pro | 8 ++++---- src/plugins/avfoundation/camera/camera.pro | 8 ++++---- src/plugins/avfoundation/mediaplayer/mediaplayer.pro | 8 ++++---- src/plugins/coreaudio/coreaudio.pro | 8 ++++---- src/plugins/directshow/directshow.pro | 7 ++++--- src/plugins/gstreamer/audiodecoder/audiodecoder.pro | 7 +++---- src/plugins/gstreamer/camerabin/camerabin.pro | 8 ++++---- src/plugins/gstreamer/mediacapture/mediacapture.pro | 8 ++++---- src/plugins/gstreamer/mediaplayer/mediaplayer.pro | 8 ++++---- src/plugins/m3u/m3u.pro | 8 ++++---- src/plugins/opensles/opensles.pro | 8 ++++---- src/plugins/pulseaudio/pulseaudio.pro | 8 ++++---- src/plugins/qnx-audio/audio/audio.pro | 5 +++-- src/plugins/qnx/qnx.pro | 8 ++++---- src/plugins/resourcepolicy/resourcepolicy.pro | 7 +++---- src/plugins/v4l/v4l.pro | 8 ++++---- src/plugins/videonode/egl/egl.pro | 11 ++++++----- src/plugins/videonode/imx6/imx6.pro | 11 ++++++----- src/plugins/windowsaudio/windowsaudio.pro | 8 ++++---- src/plugins/winrt/winrt.pro | 8 ++++---- src/plugins/wmf/wmf.pro | 8 ++++---- src/qtmultimediaquicktools/qtmultimediaquicktools.pro | 4 ++-- .../mockserviceplugin1/mockserviceplugin1.pro | 14 +++++++------- .../mockserviceplugin2/mockserviceplugin2.pro | 14 +++++++------- .../mockserviceplugin3/mockserviceplugin3.pro | 14 +++++++------- .../mockserviceplugin4/mockserviceplugin4.pro | 14 +++++++------- .../mockserviceplugin5/mockserviceplugin5.pro | 14 +++++++------- 32 files changed, 141 insertions(+), 137 deletions(-) diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index b16a792fb..acde6fe8e 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -12,8 +12,6 @@ MODULE_PLUGIN_TYPES = \ QMAKE_DOCS = $$PWD/doc/qtmultimedia.qdocconf -load(qt_module) - INCLUDEPATH *= . PRIVATE_HEADERS += \ @@ -87,3 +85,5 @@ ANDROID_FEATURES += \ win32: LIBS_PRIVATE += -luuid HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS + +load(qt_module) diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro index ec96be57c..60321fba8 100644 --- a/src/multimediawidgets/multimediawidgets.pro +++ b/src/multimediawidgets/multimediawidgets.pro @@ -7,8 +7,6 @@ qtHaveModule(opengl):!contains(QT_CONFIG, opengles1) { DEFINES += QT_NO_OPENGL } -load(qt_module) - PRIVATE_HEADERS += \ qvideowidget_p.h \ qpaintervideosurface_p.h \ @@ -44,3 +42,5 @@ maemo6 { } HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS + +load(qt_module) diff --git a/src/plugins/alsa/alsa.pro b/src/plugins/alsa/alsa.pro index 481c57eaf..56657f100 100644 --- a/src/plugins/alsa/alsa.pro +++ b/src/plugins/alsa/alsa.pro @@ -1,10 +1,6 @@ TARGET = qtaudio_alsa QT += multimedia-private -PLUGIN_TYPE = audio -PLUGIN_CLASS_NAME = QAlsaPlugin -load(qt_plugin) - LIBS += -lasound HEADERS += \ @@ -21,3 +17,7 @@ SOURCES += \ OTHER_FILES += \ alsa.json + +PLUGIN_TYPE = audio +PLUGIN_CLASS_NAME = QAlsaPlugin +load(qt_plugin) diff --git a/src/plugins/android/src/src.pro b/src/plugins/android/src/src.pro index 6a472a0a8..166bcc42b 100644 --- a/src/plugins/android/src/src.pro +++ b/src/plugins/android/src/src.pro @@ -1,9 +1,6 @@ TARGET = qtmedia_android -QT += multimedia-private core-private network -PLUGIN_TYPE = mediaservice -PLUGIN_CLASS_NAME = QAndroidMediaServicePlugin -load(qt_plugin) +QT += multimedia-private core-private network HEADERS += \ qandroidmediaserviceplugin.h @@ -17,3 +14,7 @@ include (mediaplayer/mediaplayer.pri) include (mediacapture/mediacapture.pri) OTHER_FILES += android_mediaservice.json + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = QAndroidMediaServicePlugin +load(qt_plugin) diff --git a/src/plugins/android/videonode/videonode.pro b/src/plugins/android/videonode/videonode.pro index 661e36436..daf07c9ec 100644 --- a/src/plugins/android/videonode/videonode.pro +++ b/src/plugins/android/videonode/videonode.pro @@ -1,10 +1,6 @@ TARGET = qtsgvideonode_android -QT += quick multimedia-private qtmultimediaquicktools-private -PLUGIN_TYPE = video/videonode -PLUGIN_EXTENDS = quick -PLUGIN_CLASS_NAME = QAndroidSGVideoNodeFactoryPlugin -load(qt_plugin) +QT += quick multimedia-private qtmultimediaquicktools-private HEADERS += \ qandroidsgvideonodeplugin.h \ @@ -15,3 +11,8 @@ SOURCES += \ qandroidsgvideonode.cpp OTHER_FILES += android_videonode.json + +PLUGIN_TYPE = video/videonode +PLUGIN_EXTENDS = quick +PLUGIN_CLASS_NAME = QAndroidSGVideoNodeFactoryPlugin +load(qt_plugin) diff --git a/src/plugins/audiocapture/audiocapture.pro b/src/plugins/audiocapture/audiocapture.pro index 833e4b5fc..ba2e5c802 100644 --- a/src/plugins/audiocapture/audiocapture.pro +++ b/src/plugins/audiocapture/audiocapture.pro @@ -1,10 +1,6 @@ TARGET = qtmedia_audioengine QT += multimedia-private -PLUGIN_TYPE=mediaservice -PLUGIN_CLASS_NAME = AudioCaptureServicePlugin -load(qt_plugin) - HEADERS += audioencodercontrol.h \ audiocontainercontrol.h \ audiomediarecordercontrol.h \ @@ -25,3 +21,7 @@ SOURCES += audioencodercontrol.cpp \ OTHER_FILES += \ audiocapture.json + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = AudioCaptureServicePlugin +load(qt_plugin) diff --git a/src/plugins/avfoundation/camera/camera.pro b/src/plugins/avfoundation/camera/camera.pro index a82d88ded..4e443cc1d 100644 --- a/src/plugins/avfoundation/camera/camera.pro +++ b/src/plugins/avfoundation/camera/camera.pro @@ -4,10 +4,6 @@ CONFIG += no_keywords TARGET = qavfcamera QT += multimedia-private network -PLUGIN_TYPE = mediaservice -PLUGIN_CLASS_NAME = AVFServicePlugin -load(qt_plugin) - LIBS += -framework AudioToolbox \ -framework CoreAudio \ -framework QuartzCore \ @@ -79,3 +75,7 @@ OBJECTIVE_SOURCES += avfcamerazoomcontrol.mm \ avfmediarecordercontrol_ios.mm } + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = AVFServicePlugin +load(qt_plugin) diff --git a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro index 28cdc2727..ff9e5bca9 100644 --- a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro +++ b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro @@ -7,10 +7,6 @@ CONFIG += no_keywords TARGET = qavfmediaplayer QT += multimedia-private network -PLUGIN_TYPE = mediaservice -PLUGIN_CLASS_NAME = AVFMediaPlayerServicePlugin -load(qt_plugin) - LIBS += -framework AVFoundation -framework CoreMedia DEFINES += QMEDIA_AVF_MEDIAPLAYER @@ -74,3 +70,7 @@ ios { OTHER_FILES += \ avfmediaplayer.json + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = AVFMediaPlayerServicePlugin +load(qt_plugin) diff --git a/src/plugins/coreaudio/coreaudio.pro b/src/plugins/coreaudio/coreaudio.pro index 146851493..0757b463c 100644 --- a/src/plugins/coreaudio/coreaudio.pro +++ b/src/plugins/coreaudio/coreaudio.pro @@ -1,10 +1,6 @@ TARGET = qtaudio_coreaudio QT += multimedia-private -PLUGIN_TYPE = audio -PLUGIN_CLASS_NAME = CoreAudioPlugin - -load(qt_plugin) OTHER_FILES += \ coreaudio.json @@ -37,3 +33,7 @@ ios { LIBS += \ -framework CoreAudio \ -framework AudioToolbox + +PLUGIN_TYPE = audio +PLUGIN_CLASS_NAME = CoreAudioPlugin +load(qt_plugin) diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index 4d7183923..280b52619 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -2,9 +2,6 @@ TARGET = dsengine win32:!qtHaveModule(opengl)|contains(QT_CONFIG,dynamicgl) { LIBS_PRIVATE += -lgdi32 -luser32 } -PLUGIN_TYPE=mediaservice -PLUGIN_CLASS_NAME = DSServicePlugin -load(qt_plugin) QT += multimedia-private @@ -21,3 +18,7 @@ include(camera/camera.pri) OTHER_FILES += \ directshow.json \ directshow_camera.json + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = DSServicePlugin +load(qt_plugin) diff --git a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro index 8cd1d587e..4e816e920 100644 --- a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro +++ b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro @@ -1,9 +1,5 @@ TARGET = gstaudiodecoder -PLUGIN_TYPE = mediaservice -PLUGIN_CLASS_NAME = QGstreamerAudioDecoderServicePlugin -load(qt_plugin) - include(../common.pri) INCLUDEPATH += $$PWD @@ -23,3 +19,6 @@ SOURCES += \ OTHER_FILES += \ audiodecoder.json +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = QGstreamerAudioDecoderServicePlugin +load(qt_plugin) diff --git a/src/plugins/gstreamer/camerabin/camerabin.pro b/src/plugins/gstreamer/camerabin/camerabin.pro index b807071f2..214489f3e 100644 --- a/src/plugins/gstreamer/camerabin/camerabin.pro +++ b/src/plugins/gstreamer/camerabin/camerabin.pro @@ -2,10 +2,6 @@ TARGET = gstcamerabin QT += multimedia-private -PLUGIN_TYPE = mediaservice -PLUGIN_CLASS_NAME = CameraBinServicePlugin -load(qt_plugin) - include(../common.pri) INCLUDEPATH += $$PWD \ @@ -101,3 +97,7 @@ config_linux_v4l: { OTHER_FILES += \ camerabin.json + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = CameraBinServicePlugin +load(qt_plugin) diff --git a/src/plugins/gstreamer/mediacapture/mediacapture.pro b/src/plugins/gstreamer/mediacapture/mediacapture.pro index 5baa0fd8f..db5210d4d 100644 --- a/src/plugins/gstreamer/mediacapture/mediacapture.pro +++ b/src/plugins/gstreamer/mediacapture/mediacapture.pro @@ -1,9 +1,5 @@ TARGET = gstmediacapture -PLUGIN_TYPE = mediaservice -PLUGIN_CLASS_NAME = QGstreamerCaptureServicePlugin -load(qt_plugin) - include(../common.pri) INCLUDEPATH += $$PWD @@ -50,3 +46,7 @@ use_gstreamer_camera:config_linux_v4l { OTHER_FILES += \ mediacapture.json } + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = QGstreamerCaptureServicePlugin +load(qt_plugin) diff --git a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro index b986fc787..5ccf89bfd 100644 --- a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro +++ b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro @@ -1,9 +1,5 @@ TARGET = gstmediaplayer -PLUGIN_TYPE = mediaservice -PLUGIN_CLASS_NAME = QGstreamerPlayerServicePlugin -load(qt_plugin) - include(../common.pri) INCLUDEPATH += $$PWD @@ -28,3 +24,7 @@ SOURCES += \ OTHER_FILES += \ mediaplayer.json + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = QGstreamerPlayerServicePlugin +load(qt_plugin) diff --git a/src/plugins/m3u/m3u.pro b/src/plugins/m3u/m3u.pro index 3897e2de8..d46911e0d 100644 --- a/src/plugins/m3u/m3u.pro +++ b/src/plugins/m3u/m3u.pro @@ -1,12 +1,12 @@ TARGET = qtmultimedia_m3u QT += multimedia-private -PLUGIN_TYPE=playlistformats -PLUGIN_CLASS_NAME = QM3uPlaylistPlugin -load(qt_plugin) - HEADERS += qm3uhandler.h SOURCES += qm3uhandler.cpp OTHER_FILES += \ m3u.json + +PLUGIN_TYPE = playlistformats +PLUGIN_CLASS_NAME = QM3uPlaylistPlugin +load(qt_plugin) diff --git a/src/plugins/opensles/opensles.pro b/src/plugins/opensles/opensles.pro index aa8e05444..2bb0f3cf5 100644 --- a/src/plugins/opensles/opensles.pro +++ b/src/plugins/opensles/opensles.pro @@ -1,10 +1,6 @@ TARGET = qtaudio_opensles QT += multimedia-private core-private -PLUGIN_TYPE = audio -PLUGIN_CLASS_NAME = QOpenSLESPlugin -load(qt_plugin) - LIBS += -lOpenSLES HEADERS += \ @@ -23,3 +19,7 @@ SOURCES += \ OTHER_FILES += \ opensles.json + +PLUGIN_TYPE = audio +PLUGIN_CLASS_NAME = QOpenSLESPlugin +load(qt_plugin) diff --git a/src/plugins/pulseaudio/pulseaudio.pro b/src/plugins/pulseaudio/pulseaudio.pro index e8ab9317c..7f4d3de22 100644 --- a/src/plugins/pulseaudio/pulseaudio.pro +++ b/src/plugins/pulseaudio/pulseaudio.pro @@ -1,10 +1,6 @@ TARGET = qtmedia_pulse QT += multimedia-private -PLUGIN_TYPE = audio -PLUGIN_CLASS_NAME = QPulseAudioPlugin -load(qt_plugin) - CONFIG += link_pkgconfig PKGCONFIG += libpulse @@ -24,3 +20,7 @@ SOURCES += qpulseaudioplugin.cpp \ OTHER_FILES += \ pulseaudio.json + +PLUGIN_TYPE = audio +PLUGIN_CLASS_NAME = QPulseAudioPlugin +load(qt_plugin) diff --git a/src/plugins/qnx-audio/audio/audio.pro b/src/plugins/qnx-audio/audio/audio.pro index 35ddf73de..bf4300a71 100644 --- a/src/plugins/qnx-audio/audio/audio.pro +++ b/src/plugins/qnx-audio/audio/audio.pro @@ -2,8 +2,6 @@ TARGET = qtmedia_qnx_audio QT += multimedia-private CONFIG += no_private_qt_headers_warning -PLUGIN_TYPE = audio -load(qt_plugin) LIBS += -lasound @@ -20,3 +18,6 @@ SOURCES += qnxaudioplugin.cpp \ qnxaudioutils.cpp OTHER_FILES += qnx_audio.json + +PLUGIN_TYPE = audio +load(qt_plugin) diff --git a/src/plugins/qnx/qnx.pro b/src/plugins/qnx/qnx.pro index f01562116..4d76fa5f7 100644 --- a/src/plugins/qnx/qnx.pro +++ b/src/plugins/qnx/qnx.pro @@ -1,10 +1,6 @@ TARGET = qtmedia_qnx QT += multimedia-private gui-private -PLUGIN_TYPE=mediaservice -PLUGIN_CLASS_NAME = BbServicePlugin -load(qt_plugin) - LIBS += -lscreen include(common/common.pri) @@ -20,3 +16,7 @@ blackberry { SOURCES += neutrinoserviceplugin.cpp OTHER_FILES += neutrino_mediaservice.json } + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = BbServicePlugin +load(qt_plugin) diff --git a/src/plugins/resourcepolicy/resourcepolicy.pro b/src/plugins/resourcepolicy/resourcepolicy.pro index 4805c5250..e333bac09 100644 --- a/src/plugins/resourcepolicy/resourcepolicy.pro +++ b/src/plugins/resourcepolicy/resourcepolicy.pro @@ -4,10 +4,6 @@ QT += multimedia-private CONFIG += no_private_qt_headers_warning link_pkgconfig PKGCONFIG += libresourceqt5 -PLUGIN_TYPE = resourcepolicy -PLUGIN_CLASS_NAME = ResourceQtPolicyPlugin -load(qt_plugin) - INCLUDEPATH += $$PWD \ $${SOURCE_DIR}/src/multimedia @@ -21,3 +17,6 @@ SOURCES += \ $$PWD/resourcepolicyimpl.cpp \ $$PWD/resourcepolicyint.cpp +PLUGIN_TYPE = resourcepolicy +PLUGIN_CLASS_NAME = ResourceQtPolicyPlugin +load(qt_plugin) diff --git a/src/plugins/v4l/v4l.pro b/src/plugins/v4l/v4l.pro index c5e953538..28d89e3e9 100644 --- a/src/plugins/v4l/v4l.pro +++ b/src/plugins/v4l/v4l.pro @@ -1,11 +1,11 @@ TARGET = qtmedia_v4lengine QT += multimedia-private -PLUGIN_TYPE = mediaservice -PLUGIN_CLASS_NAME = V4LServicePlugin -load(qt_plugin) - HEADERS += v4lserviceplugin.h SOURCES += v4lserviceplugin.cpp include(radio/radio.pri) + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = V4LServicePlugin +load(qt_plugin) diff --git a/src/plugins/videonode/egl/egl.pro b/src/plugins/videonode/egl/egl.pro index a6256cea1..7151123ea 100644 --- a/src/plugins/videonode/egl/egl.pro +++ b/src/plugins/videonode/egl/egl.pro @@ -1,12 +1,8 @@ TARGET = eglvideonode + QT += multimedia-private qtmultimediaquicktools-private CONFIG += egl -PLUGIN_TYPE=video/videonode -PLUGIN_EXTENDS = quick -PLUGIN_CLASS_NAME = QSGVideoNodeFactory_EGL -load(qt_plugin) - HEADERS += \ qsgvideonode_egl.h @@ -15,3 +11,8 @@ SOURCES += \ OTHER_FILES += \ egl.json + +PLUGIN_TYPE = video/videonode +PLUGIN_EXTENDS = quick +PLUGIN_CLASS_NAME = QSGVideoNodeFactory_EGL +load(qt_plugin) diff --git a/src/plugins/videonode/imx6/imx6.pro b/src/plugins/videonode/imx6/imx6.pro index 36e25e86b..c8085a31e 100644 --- a/src/plugins/videonode/imx6/imx6.pro +++ b/src/plugins/videonode/imx6/imx6.pro @@ -1,10 +1,6 @@ TARGET = imx6vivantevideonode -QT += multimedia-private qtmultimediaquicktools-private -PLUGIN_TYPE=video/videonode -PLUGIN_EXTENDS = quick -PLUGIN_CLASS_NAME = QSGVivanteVideoNodeFactory -load(qt_plugin) +QT += multimedia-private qtmultimediaquicktools-private HEADERS += \ qsgvivantevideonode.h \ @@ -20,3 +16,8 @@ SOURCES += \ OTHER_FILES += \ imx6.json + +PLUGIN_TYPE = video/videonode +PLUGIN_EXTENDS = quick +PLUGIN_CLASS_NAME = QSGVivanteVideoNodeFactory +load(qt_plugin) diff --git a/src/plugins/windowsaudio/windowsaudio.pro b/src/plugins/windowsaudio/windowsaudio.pro index 7e8e4320b..ce64847dc 100644 --- a/src/plugins/windowsaudio/windowsaudio.pro +++ b/src/plugins/windowsaudio/windowsaudio.pro @@ -1,10 +1,6 @@ TARGET = qtaudio_windows QT += multimedia-private -PLUGIN_TYPE = audio -PLUGIN_CLASS_NAME = QWindowsAudioPlugin -load(qt_plugin) - LIBS += -lstrmiids -lole32 -loleaut32 !wince*:LIBS += -lwinmm @@ -24,3 +20,7 @@ SOURCES += \ OTHER_FILES += \ windowsaudio.json + +PLUGIN_TYPE = audio +PLUGIN_CLASS_NAME = QWindowsAudioPlugin +load(qt_plugin) diff --git a/src/plugins/winrt/winrt.pro b/src/plugins/winrt/winrt.pro index 2f87ea8ff..87e44cce2 100644 --- a/src/plugins/winrt/winrt.pro +++ b/src/plugins/winrt/winrt.pro @@ -1,10 +1,6 @@ TARGET = winrtengine QT += multimedia-private -PLUGIN_TYPE=mediaservice -PLUGIN_CLASS_NAME = WinRTServicePlugin -load(qt_plugin) - LIBS += -lmfplat -lmfuuid -loleaut32 -ld3d11 -lruntimeobject HEADERS += \ @@ -43,3 +39,7 @@ SOURCES += \ OTHER_FILES += \ winrt.json + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = WinRTServicePlugin +load(qt_plugin) diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro index 1f43bb128..e83c51595 100644 --- a/src/plugins/wmf/wmf.pro +++ b/src/plugins/wmf/wmf.pro @@ -5,10 +5,6 @@ win32:!qtHaveModule(opengl) { LIBS_PRIVATE += -lgdi32 -luser32 } -PLUGIN_TYPE=mediaservice -PLUGIN_CLASS_NAME = WMFServicePlugin -load(qt_plugin) - INCLUDEPATH += . HEADERS += \ @@ -32,3 +28,7 @@ include (decoder/decoder.pri) OTHER_FILES += \ wmf.json + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = WMFServicePlugin +load(qt_plugin) diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro index b38f209e3..0a5110f59 100644 --- a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro +++ b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro @@ -2,8 +2,6 @@ TARGET = QtMultimediaQuick_p QT = core quick multimedia-private CONFIG += internal_module -load(qt_module) - DEFINES += QT_BUILD_QTMM_QUICK_LIB # Header files must go inside source directory of a module @@ -47,3 +45,5 @@ OTHER_FILES += \ shaders/biplanaryuvvideo_swizzle.frag \ shaders/triplanaryuvvideo.vert \ shaders/triplanaryuvvideo.frag + +load(qt_module) diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro index 68dee28a9..2b7412d16 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro @@ -1,7 +1,13 @@ TARGET = mockserviceplugin1 QT += multimedia-private -PLUGIN_TYPE=mediaservice +HEADERS += ../mockservice.h +SOURCES += mockserviceplugin1.cpp +OTHER_FILES += mockserviceplugin1.json + +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +PLUGIN_TYPE = mediaservice PLUGIN_CLASS_NAME = MockServicePlugin1 load(qt_plugin) @@ -14,10 +20,4 @@ win32 { } } -HEADERS += ../mockservice.h -SOURCES += mockserviceplugin1.cpp -OTHER_FILES += mockserviceplugin1.json - target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} - -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro index 98a3ca4a4..ff793ec85 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro @@ -1,7 +1,13 @@ TARGET = mockserviceplugin2 QT += multimedia-private -PLUGIN_TYPE=mediaservice +HEADERS += ../mockservice.h +SOURCES += mockserviceplugin2.cpp +OTHER_FILES += mockserviceplugin2.json + +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +PLUGIN_TYPE = mediaservice PLUGIN_CLASS_NAME = MockServicePlugin2 load(qt_plugin) @@ -14,10 +20,4 @@ win32 { } } -HEADERS += ../mockservice.h -SOURCES += mockserviceplugin2.cpp -OTHER_FILES += mockserviceplugin2.json - target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} - -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro index 50def293f..15e9dc659 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro @@ -1,7 +1,13 @@ TARGET = mockserviceplugin3 QT += multimedia-private -PLUGIN_TYPE=mediaservice +HEADERS += ../mockservice.h +SOURCES += mockserviceplugin3.cpp +OTHER_FILES += mockserviceplugin3.json + +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +PLUGIN_TYPE = mediaservice PLUGIN_CLASS_NAME = MockServicePlugin3 load(qt_plugin) @@ -14,10 +20,4 @@ win32 { } } -HEADERS += ../mockservice.h -SOURCES += mockserviceplugin3.cpp -OTHER_FILES += mockserviceplugin3.json - target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} - -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro index 57b715f52..894d92939 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro @@ -1,7 +1,13 @@ TARGET = mockserviceplugin4 QT += multimedia-private -PLUGIN_TYPE=mediaservice +HEADERS += ../mockservice.h +SOURCES += mockserviceplugin4.cpp +OTHER_FILES += mockserviceplugin4.json + +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +PLUGIN_TYPE = mediaservice PLUGIN_CLASS_NAME = MockServicePlugin4 load(qt_plugin) @@ -14,10 +20,4 @@ win32 { } } -HEADERS += ../mockservice.h -SOURCES += mockserviceplugin4.cpp -OTHER_FILES += mockserviceplugin4.json - target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} - -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro index 9657e3cc1..093c24746 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro @@ -1,7 +1,13 @@ TARGET = mockserviceplugin5 QT += multimedia-private -PLUGIN_TYPE=mediaservice +HEADERS += ../mockservice.h +SOURCES += mockserviceplugin5.cpp +OTHER_FILES += mockserviceplugin5.json + +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +PLUGIN_TYPE = mediaservice PLUGIN_CLASS_NAME = MockServicePlugin5 load(qt_plugin) @@ -14,10 +20,4 @@ win32 { } } -HEADERS += ../mockservice.h -SOURCES += mockserviceplugin5.cpp -OTHER_FILES += mockserviceplugin5.json - target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} - -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -- cgit v1.2.3 From 3408abef86f49b0d2bd5de7f8dcf24a125166242 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Feb 2016 16:25:16 +0100 Subject: rely on the automatically defined QT_BUILD_*_LIB Change-Id: I8c1c755270aa0a703103925656f7c1b555e4db1f Reviewed-by: Yoann Lopes --- .../qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h | 2 +- src/qtmultimediaquicktools/qtmultimediaquicktools.pro | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h b/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h index ac8f0ac71..0421e6cb9 100644 --- a/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h +++ b/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h @@ -48,7 +48,7 @@ #include #ifndef QT_STATIC -# if defined(QT_BUILD_QTMM_QUICK_LIB) +# if defined(QT_BUILD_QTMULTIMEDIAQUICKTOOLS_LIB) # define Q_MULTIMEDIAQUICK_EXPORT Q_DECL_EXPORT # else # define Q_MULTIMEDIAQUICK_EXPORT Q_DECL_IMPORT diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro index 0a5110f59..e1425c3ec 100644 --- a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro +++ b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro @@ -1,9 +1,8 @@ TARGET = QtMultimediaQuick_p + QT = core quick multimedia-private CONFIG += internal_module -DEFINES += QT_BUILD_QTMM_QUICK_LIB - # Header files must go inside source directory of a module # to be installed by syncqt. INCLUDEPATH += ../multimedia/qtmultimediaquicktools_headers/ -- cgit v1.2.3 From 3ef3e5b1019cd727ec9ca5a16c7615b016db19ea Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Feb 2016 16:31:29 +0100 Subject: remove redundant statements from project files - TARGET is unnecessary if it matches the project file's basename - CONFIG+=no_private_qt_headers_warning is added by qt_build_config.prf - load(qt_build_config) is done by .qmake.conf Change-Id: I3eb45a758dfee34be3c78fc13d996780741c95e9 Reviewed-by: Joerg Bornemann Reviewed-by: Yoann Lopes --- src/plugins/avfoundation/mediaplayer/mediaplayer.pro | 1 - src/plugins/gstreamer/common.pri | 1 - src/plugins/qnx-audio/audio/audio.pro | 3 +-- src/plugins/resourcepolicy/resourcepolicy.pro | 2 +- tests/auto/unit/qaudiodecoder/qaudiodecoder.pro | 8 +------- tests/auto/unit/qaudioprobe/qaudioprobe.pro | 2 +- tests/auto/unit/qaudiorecorder/qaudiorecorder.pro | 2 +- tests/auto/unit/qmediaobject/qmediaobject.pro | 2 +- tests/auto/unit/qmediaplayer/qmediaplayer.pro | 2 +- tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro | 2 +- tests/auto/unit/qmediarecorder/qmediarecorder.pro | 2 +- .../mockserviceplugin1/mockserviceplugin1.pro | 1 - .../mockserviceplugin2/mockserviceplugin2.pro | 1 - .../mockserviceplugin3/mockserviceplugin3.pro | 1 - .../mockserviceplugin4/mockserviceplugin4.pro | 1 - .../mockserviceplugin5/mockserviceplugin5.pro | 1 - tests/auto/unit/qradiodata/qradiodata.pro | 2 +- tests/auto/unit/qradiotuner/qradiotuner.pro | 2 +- tests/auto/unit/qsamplecache/qsamplecache.pro | 2 +- tests/auto/unit/qvideoprobe/qvideoprobe.pro | 2 +- tests/auto/unit/qwavedecoder/qwavedecoder.pro | 2 +- 21 files changed, 14 insertions(+), 28 deletions(-) diff --git a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro index ff9e5bca9..bca16f48d 100644 --- a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro +++ b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro @@ -1,4 +1,3 @@ -load(qt_build_config) #DEFINES += QT_DEBUG_AVF # Avoid clash with a variable named `slots' in a Quartz header diff --git a/src/plugins/gstreamer/common.pri b/src/plugins/gstreamer/common.pri index eb6a29987..babdb7cfb 100644 --- a/src/plugins/gstreamer/common.pri +++ b/src/plugins/gstreamer/common.pri @@ -1,6 +1,5 @@ QT += core-private multimedia-private network -CONFIG += no_private_qt_headers_warning qtHaveModule(widgets) { QT += widgets multimediawidgets-private diff --git a/src/plugins/qnx-audio/audio/audio.pro b/src/plugins/qnx-audio/audio/audio.pro index bf4300a71..bd69dfe1e 100644 --- a/src/plugins/qnx-audio/audio/audio.pro +++ b/src/plugins/qnx-audio/audio/audio.pro @@ -1,7 +1,6 @@ TARGET = qtmedia_qnx_audio -QT += multimedia-private -CONFIG += no_private_qt_headers_warning +QT += multimedia-private LIBS += -lasound diff --git a/src/plugins/resourcepolicy/resourcepolicy.pro b/src/plugins/resourcepolicy/resourcepolicy.pro index e333bac09..91a946665 100644 --- a/src/plugins/resourcepolicy/resourcepolicy.pro +++ b/src/plugins/resourcepolicy/resourcepolicy.pro @@ -1,7 +1,7 @@ TARGET = resourceqt QT += multimedia-private -CONFIG += no_private_qt_headers_warning link_pkgconfig +CONFIG += link_pkgconfig PKGCONFIG += libresourceqt5 INCLUDEPATH += $$PWD \ diff --git a/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro b/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro index ff9ba8f05..0bf841b35 100644 --- a/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro +++ b/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro @@ -1,14 +1,8 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2012-02-07T15:27:07 -# -#------------------------------------------------- - QT += multimedia multimedia-private testlib gui TARGET = tst_qaudiodecoder -CONFIG += testcase no_private_qt_headers_warning +CONFIG += testcase TEMPLATE = app diff --git a/tests/auto/unit/qaudioprobe/qaudioprobe.pro b/tests/auto/unit/qaudioprobe/qaudioprobe.pro index fe2000716..f52bafb94 100644 --- a/tests/auto/unit/qaudioprobe/qaudioprobe.pro +++ b/tests/auto/unit/qaudioprobe/qaudioprobe.pro @@ -1,4 +1,4 @@ -CONFIG += testcase no_private_qt_headers_warning +CONFIG += testcase TARGET = tst_qaudioprobe QT += multimedia-private testlib diff --git a/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro b/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro index 7ee5222c6..beab48213 100644 --- a/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro +++ b/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro @@ -1,4 +1,4 @@ -CONFIG += testcase no_private_qt_headers_warning +CONFIG += testcase TARGET = tst_qaudiorecorder QT += multimedia-private testlib diff --git a/tests/auto/unit/qmediaobject/qmediaobject.pro b/tests/auto/unit/qmediaobject/qmediaobject.pro index 597ddd009..787982fe5 100644 --- a/tests/auto/unit/qmediaobject/qmediaobject.pro +++ b/tests/auto/unit/qmediaobject/qmediaobject.pro @@ -1,4 +1,4 @@ -CONFIG += testcase no_private_qt_headers_warning +CONFIG += testcase TARGET = tst_qmediaobject QT += multimedia-private testlib diff --git a/tests/auto/unit/qmediaplayer/qmediaplayer.pro b/tests/auto/unit/qmediaplayer/qmediaplayer.pro index cbdbf71f4..04ce09733 100644 --- a/tests/auto/unit/qmediaplayer/qmediaplayer.pro +++ b/tests/auto/unit/qmediaplayer/qmediaplayer.pro @@ -1,4 +1,4 @@ -CONFIG += testcase no_private_qt_headers_warning +CONFIG += testcase TARGET = tst_qmediaplayer QT += network multimedia-private testlib SOURCES += tst_qmediaplayer.cpp diff --git a/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro b/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro index ce723fbe1..c84d66e9c 100644 --- a/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro +++ b/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro @@ -1,4 +1,4 @@ -CONFIG += testcase no_private_qt_headers_warning +CONFIG += testcase TARGET = tst_qmediaplayerwidgets QT += network multimedia-private multimediawidgets-private testlib widgets SOURCES += tst_qmediaplayerwidgets.cpp diff --git a/tests/auto/unit/qmediarecorder/qmediarecorder.pro b/tests/auto/unit/qmediarecorder/qmediarecorder.pro index f6fac0440..99e0de53b 100644 --- a/tests/auto/unit/qmediarecorder/qmediarecorder.pro +++ b/tests/auto/unit/qmediarecorder/qmediarecorder.pro @@ -1,4 +1,4 @@ -CONFIG += testcase no_private_qt_headers_warning +CONFIG += testcase TARGET = tst_qmediarecorder QT += multimedia-private testlib SOURCES += tst_qmediarecorder.cpp diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro index 2b7412d16..7fcaadbc2 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro @@ -1,4 +1,3 @@ -TARGET = mockserviceplugin1 QT += multimedia-private HEADERS += ../mockservice.h diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro index ff793ec85..4ac001ec9 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro @@ -1,4 +1,3 @@ -TARGET = mockserviceplugin2 QT += multimedia-private HEADERS += ../mockservice.h diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro index 15e9dc659..34cd2fed1 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro @@ -1,4 +1,3 @@ -TARGET = mockserviceplugin3 QT += multimedia-private HEADERS += ../mockservice.h diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro index 894d92939..0900bfc40 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro @@ -1,4 +1,3 @@ -TARGET = mockserviceplugin4 QT += multimedia-private HEADERS += ../mockservice.h diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro index 093c24746..37f287f9d 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro @@ -1,4 +1,3 @@ -TARGET = mockserviceplugin5 QT += multimedia-private HEADERS += ../mockservice.h diff --git a/tests/auto/unit/qradiodata/qradiodata.pro b/tests/auto/unit/qradiodata/qradiodata.pro index a4937cc51..01a1f005f 100644 --- a/tests/auto/unit/qradiodata/qradiodata.pro +++ b/tests/auto/unit/qradiodata/qradiodata.pro @@ -1,4 +1,4 @@ -CONFIG += testcase no_private_qt_headers_warning +CONFIG += testcase TARGET = tst_qradiodata QT += multimedia-private testlib SOURCES += tst_qradiodata.cpp diff --git a/tests/auto/unit/qradiotuner/qradiotuner.pro b/tests/auto/unit/qradiotuner/qradiotuner.pro index e0638c1f8..c449e03ae 100644 --- a/tests/auto/unit/qradiotuner/qradiotuner.pro +++ b/tests/auto/unit/qradiotuner/qradiotuner.pro @@ -1,4 +1,4 @@ -CONFIG += testcase no_private_qt_headers_warning +CONFIG += testcase TARGET = tst_qradiotuner QT += multimedia-private testlib SOURCES += tst_qradiotuner.cpp diff --git a/tests/auto/unit/qsamplecache/qsamplecache.pro b/tests/auto/unit/qsamplecache/qsamplecache.pro index 1f0db1b58..d6fa7c4e0 100644 --- a/tests/auto/unit/qsamplecache/qsamplecache.pro +++ b/tests/auto/unit/qsamplecache/qsamplecache.pro @@ -1,4 +1,4 @@ -CONFIG += no_private_qt_headers_warning testcase +CONFIG += testcase TARGET = tst_qsamplecache QT += multimedia-private testlib diff --git a/tests/auto/unit/qvideoprobe/qvideoprobe.pro b/tests/auto/unit/qvideoprobe/qvideoprobe.pro index 0bd4102a8..88e8eebbe 100644 --- a/tests/auto/unit/qvideoprobe/qvideoprobe.pro +++ b/tests/auto/unit/qvideoprobe/qvideoprobe.pro @@ -1,4 +1,4 @@ -CONFIG += testcase no_private_qt_headers_warning +CONFIG += testcase TARGET = tst_qvideoprobe QT += multimedia-private testlib diff --git a/tests/auto/unit/qwavedecoder/qwavedecoder.pro b/tests/auto/unit/qwavedecoder/qwavedecoder.pro index 1b6af7e86..a24273f3c 100644 --- a/tests/auto/unit/qwavedecoder/qwavedecoder.pro +++ b/tests/auto/unit/qwavedecoder/qwavedecoder.pro @@ -4,7 +4,7 @@ SOURCES += tst_qwavedecoder.cpp \ ../../../../src/multimedia/audio/qwavedecoder_p.cpp QT += multimedia-private testlib network -CONFIG += no_private_qt_headers_warning testcase +CONFIG += testcase TESTDATA += data/* DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -- cgit v1.2.3 From 8f9bc2ed726f0927914426e9ff7713e09d0ca8b1 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Feb 2016 16:31:39 +0100 Subject: standardize statement order in project files a bit Change-Id: I96bbe1343eedbad6b48579d700bbb6b5b80d69f1 Reviewed-by: Joerg Bornemann --- src/plugins/avfoundation/camera/camera.pro | 3 ++- src/plugins/avfoundation/mediaplayer/mediaplayer.pro | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/avfoundation/camera/camera.pro b/src/plugins/avfoundation/camera/camera.pro index 4e443cc1d..8563eb655 100644 --- a/src/plugins/avfoundation/camera/camera.pro +++ b/src/plugins/avfoundation/camera/camera.pro @@ -1,7 +1,8 @@ +TARGET = qavfcamera + # Avoid clash with a variable named `slots' in a Quartz header CONFIG += no_keywords -TARGET = qavfcamera QT += multimedia-private network LIBS += -framework AudioToolbox \ diff --git a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro index bca16f48d..d0edd5cc4 100644 --- a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro +++ b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro @@ -1,9 +1,9 @@ +TARGET = qavfmediaplayer #DEFINES += QT_DEBUG_AVF # Avoid clash with a variable named `slots' in a Quartz header CONFIG += no_keywords -TARGET = qavfmediaplayer QT += multimedia-private network LIBS += -framework AVFoundation -framework CoreMedia -- cgit v1.2.3 From 58019c256eb7cc2b5c65ab4feedb7103079d7438 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 26 Feb 2016 10:29:22 +0100 Subject: Fix constructor parameters in tst_QMediaPlaylist. Fix warning: tst_qmediaplaylist.cpp: In member function 'void tst_QMediaPlaylist::mediaPlayListControl()': tst_qmediaplaylist.cpp:1221:49: warning: the address of 'parent' will always evaluate as 'true' [-Waddress] Change-Id: I46391550d07a8f58442269d0e5eae418258adbff Reviewed-by: Yoann Lopes --- tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp index 104046d0e..fb7773834 100644 --- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp +++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp @@ -1223,7 +1223,7 @@ void tst_QMediaPlaylist::mediaPlayListControl() { // To check changes in abstract classe's pure virtual functions QObject parent; - MockMediaPlaylistControl plylistctrl(&parent); + MockMediaPlaylistControl plylistctrl(false, &parent); } // MaemoAPI-1850:test QMediaPlayListSourceControl constructor -- cgit v1.2.3 From 1816f89b6fc1f62ea2b97fabf43963b3312a7c08 Mon Sep 17 00:00:00 2001 From: Dyami Caliri Date: Mon, 22 Feb 2016 08:37:00 -0800 Subject: PulseAudio: fix playback for short streams in pull mode If the provided stream's length is shorter than the stream prebuf attribute, the stream will never play. We adjust the prebuf attribute in this case. Change-Id: Ia397ac967ad2fa357a7aba137fbb78de272440ed Reviewed-by: Yoann Lopes --- src/plugins/pulseaudio/qaudiooutput_pulse.cpp | 38 ++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp index a654af86c..5d2ba8653 100644 --- a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp +++ b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp @@ -133,6 +133,18 @@ static void outputStreamDrainComplete(pa_stream *stream, int success, void *user #endif } +static void streamAdjustPrebufferCallback(pa_stream *stream, int success, void *userdata) +{ + Q_UNUSED(stream); + Q_UNUSED(success); + Q_UNUSED(userdata); + +#ifdef DEBUG_PULSE + qDebug() << "Adjust prebuffer completed successfully: " << (bool)success; +#endif +} + + QPulseAudioOutput::QPulseAudioOutput(const QByteArray &device) : m_device(device) , m_errorState(QAudio::NoError) @@ -207,17 +219,19 @@ void QPulseAudioOutput::start(QIODevice *device) // Handle change of mode if (m_audioSource && !m_pullMode) { delete m_audioSource; - m_audioSource = 0; } + m_audioSource = 0; close(); - if (!open()) - return; - m_pullMode = true; m_audioSource = device; + if (!open()) { + m_audioSource = 0; + return; + } + setState(QAudio::ActiveState); } @@ -229,17 +243,18 @@ QIODevice *QPulseAudioOutput::start() // Handle change of mode if (m_audioSource && !m_pullMode) { delete m_audioSource; - m_audioSource = 0; } + m_audioSource = 0; close(); + m_pullMode = false; + if (!open()) return Q_NULLPTR; m_audioSource = new PulseOutputPrivate(this); m_audioSource->open(QIODevice::WriteOnly|QIODevice::Unbuffered); - m_pullMode = false; setState(QAudio::IdleState); @@ -349,6 +364,17 @@ bool QPulseAudioOutput::open() m_bufferSize = buffer->tlength; m_maxBufferSize = buffer->maxlength; m_audioBuffer = new char[m_maxBufferSize]; + + const qint64 streamSize = m_audioSource ? m_audioSource->size() : 0; + if (m_pullMode && streamSize > 0 && static_cast(buffer->prebuf) > streamSize) { + pa_buffer_attr newBufferAttr; + newBufferAttr = *buffer; + newBufferAttr.prebuf = streamSize; + pa_operation *o = pa_stream_set_buffer_attr(m_stream, &newBufferAttr, streamAdjustPrebufferCallback, NULL); + if (o) + pa_operation_unref(o); + } + #ifdef DEBUG_PULSE qDebug() << "Buffering info:"; qDebug() << "\tMax length: " << buffer->maxlength; -- cgit v1.2.3 From 787211c1d2082874ea07be4c5987032221ee48fe Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 1 Mar 2016 14:58:18 +0100 Subject: Polish the QtWidgets/Player example. Point the file dialog to the Movies folder. Add command proper command line handling. Change the logic to use QUrl everywhere. Change-Id: I1e54e600187153f52a55e3a381a24e4f2eeda3ab Reviewed-by: Yoann Lopes --- examples/multimediawidgets/player/main.cpp | 20 +++++++++++ examples/multimediawidgets/player/player.cpp | 53 ++++++++++++++++------------ examples/multimediawidgets/player/player.h | 5 ++- 3 files changed, 55 insertions(+), 23 deletions(-) diff --git a/examples/multimediawidgets/player/main.cpp b/examples/multimediawidgets/player/main.cpp index c32cbc83e..a3dabe15d 100644 --- a/examples/multimediawidgets/player/main.cpp +++ b/examples/multimediawidgets/player/main.cpp @@ -41,13 +41,33 @@ #include "player.h" #include +#include +#include +#include int main(int argc, char *argv[]) { QApplication app(argc, argv); + QCoreApplication::setApplicationName("Player Example"); + QCoreApplication::setOrganizationName("QtProject"); + QCoreApplication::setApplicationVersion(QT_VERSION_STR); + QCommandLineParser parser; + parser.setApplicationDescription("Qt MultiMedia Player Example"); + parser.addHelpOption(); + parser.addVersionOption(); + parser.addPositionalArgument("url", "The URL to open."); + parser.process(app); + Player player; + if (!parser.positionalArguments().isEmpty() && player.isPlayerAvailable()) { + QList urls; + foreach (const QString &a, parser.positionalArguments()) + urls.append(QUrl::fromUserInput(a, QDir::currentPath(), QUrl::AssumeLocalFile)); + player.addToPlaylist(urls); + } + #if defined(Q_WS_SIMULATOR) player.setAttribute(Qt::WA_LockLandscapeOrientation); player.showMaximized(); diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp index b450bc361..e787aa269 100644 --- a/examples/multimediawidgets/player/player.cpp +++ b/examples/multimediawidgets/player/player.cpp @@ -167,7 +167,7 @@ Player::Player(QWidget *parent) setLayout(layout); - if (!player->isAvailable()) { + if (!isPlayerAvailable()) { QMessageBox::warning(this, tr("Service not available"), tr("The QMediaPlayer object does not have a valid service.\n"\ "Please check the media service plugins are installed.")); @@ -182,38 +182,47 @@ Player::Player(QWidget *parent) } metaDataChanged(); - - QStringList arguments = qApp->arguments(); - arguments.removeAt(0); - addToPlaylist(arguments); } Player::~Player() { } +bool Player::isPlayerAvailable() const +{ + return player->isAvailable(); +} + void Player::open() { - QStringList fileNames = QFileDialog::getOpenFileNames(this, tr("Open Files")); - addToPlaylist(fileNames); + QFileDialog fileDialog(this); + fileDialog.setAcceptMode(QFileDialog::AcceptOpen); + fileDialog.setWindowTitle(tr("Open Files")); + QStringList supportedMimeTypes = player->supportedMimeTypes(); + if (!supportedMimeTypes.isEmpty()) { + supportedMimeTypes.append("audio/x-m3u"); // MP3 playlists + fileDialog.setMimeTypeFilters(supportedMimeTypes); + } + fileDialog.setDirectory(QStandardPaths::standardLocations(QStandardPaths::MoviesLocation).value(0, QDir::homePath())); + if (fileDialog.exec() == QDialog::Accepted) + addToPlaylist(fileDialog.selectedUrls()); } -void Player::addToPlaylist(const QStringList& fileNames) +static bool isPlaylist(const QUrl &url) // Check for ".m3u" playlists. { - foreach (QString const &argument, fileNames) { - QFileInfo fileInfo(argument); - if (fileInfo.exists()) { - QUrl url = QUrl::fromLocalFile(fileInfo.absoluteFilePath()); - if (fileInfo.suffix().toLower() == QLatin1String("m3u")) { - playlist->load(url); - } else - playlist->addMedia(url); - } else { - QUrl url(argument); - if (url.isValid()) { - playlist->addMedia(url); - } - } + if (!url.isLocalFile()) + return false; + const QFileInfo fileInfo(url.toLocalFile()); + return fileInfo.exists() && !fileInfo.suffix().compare(QLatin1String("m3u"), Qt::CaseInsensitive); +} + +void Player::addToPlaylist(const QList urls) +{ + foreach (const QUrl &url, urls) { + if (isPlaylist(url)) + playlist->load(url); + else + playlist->addMedia(url); } } diff --git a/examples/multimediawidgets/player/player.h b/examples/multimediawidgets/player/player.h index 61f3cff27..7f5d0881b 100644 --- a/examples/multimediawidgets/player/player.h +++ b/examples/multimediawidgets/player/player.h @@ -69,6 +69,10 @@ public: Player(QWidget *parent = 0); ~Player(); + bool isPlayerAvailable() const; + + void addToPlaylist(const QList urls); + signals: void fullScreenChanged(bool fullScreen); @@ -93,7 +97,6 @@ private slots: #ifndef PLAYER_NO_COLOROPTIONS void showColorDialog(); #endif - void addToPlaylist(const QStringList &fileNames); private: void setTrackInfo(const QString &info); -- cgit v1.2.3 From 176179fb32277f50b86d86e4870affaf74bc6fa0 Mon Sep 17 00:00:00 2001 From: Dyami Caliri Date: Fri, 26 Feb 2016 14:24:05 -0800 Subject: PulseAudio: remove debug warning of Underrun The QAudio::UnderrunError is a normal error and is already reported to the user. Change-Id: I0ee5d827666fb08b5eb199255b3b3c5610f743c2 Reviewed-by: Yoann Lopes --- src/plugins/pulseaudio/qaudiooutput_pulse.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp index 5d2ba8653..c1d46fac4 100644 --- a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp +++ b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp @@ -85,7 +85,6 @@ static void outputStreamUnderflowCallback(pa_stream *stream, void *userdata) { Q_UNUSED(stream) ((QPulseAudioOutput*)userdata)->streamUnderflowCallback(); - qWarning() << "Got a buffer underflow!"; } static void outputStreamOverflowCallback(pa_stream *stream, void *userdata) -- cgit v1.2.3 From d2d0d93f7654fdcca118dd17a745e560d524496b Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Wed, 2 Mar 2016 12:48:39 +0000 Subject: Fix gstreamer camera when env var QT_NO_GLIB is set It would fall into the glib code path because it was only checking if QT_NO_GLIB was defined, but ignoring the env variable. gst_bus_add_watch_full only works with a glib event loop running. Task-Id: QTBUG-51607 Change-Id: I726afd5d6e114eacea6e5bc71e7a6e2d1c5bbd74 Reviewed-by: Yoann Lopes --- src/gsttools/qgstreamerbushelper.cpp | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/gsttools/qgstreamerbushelper.cpp b/src/gsttools/qgstreamerbushelper.cpp index 7db62b83c..03cf64ba8 100644 --- a/src/gsttools/qgstreamerbushelper.cpp +++ b/src/gsttools/qgstreamerbushelper.cpp @@ -35,6 +35,8 @@ #include #include #include +#include +#include #include "qgstreamerbushelper_p.h" @@ -47,31 +49,31 @@ class QGstreamerBusHelperPrivate : public QObject public: QGstreamerBusHelperPrivate(QGstreamerBusHelper *parent, GstBus* bus) : QObject(parent), + m_tag(0), m_bus(bus), - m_helper(parent) + m_helper(parent), + m_intervalTimer(nullptr) { -#ifdef QT_NO_GLIB - Q_UNUSED(bus); - - m_intervalTimer = new QTimer(this); - m_intervalTimer->setInterval(250); - - connect(m_intervalTimer, SIGNAL(timeout()), SLOT(interval())); - m_intervalTimer->start(); -#else - m_tag = gst_bus_add_watch_full(bus, 0, busCallback, this, NULL); -#endif - + // glib event loop can be disabled either by env variable or QT_NO_GLIB define, so check the dispacher + QAbstractEventDispatcher *dispatcher = QCoreApplication::eventDispatcher(); + const bool hasGlib = dispatcher && dispatcher->inherits("QEventDispatcherGlib"); + if (!hasGlib) { + m_intervalTimer = new QTimer(this); + m_intervalTimer->setInterval(250); + connect(m_intervalTimer, SIGNAL(timeout()), SLOT(interval())); + m_intervalTimer->start(); + } else { + m_tag = gst_bus_add_watch_full(bus, G_PRIORITY_DEFAULT, busCallback, this, NULL); + } } ~QGstreamerBusHelperPrivate() { m_helper = 0; -#ifdef QT_NO_GLIB - m_intervalTimer->stop(); -#else - g_source_remove(m_tag); -#endif + delete m_intervalTimer; + + if (m_tag) + g_source_remove(m_tag); } GstBus* bus() const { return m_bus; } @@ -110,9 +112,7 @@ private: guint m_tag; GstBus* m_bus; QGstreamerBusHelper* m_helper; -#ifdef QT_NO_GLIB QTimer* m_intervalTimer; -#endif private slots: void doProcessMessage(const QGstreamerMessage& msg) -- cgit v1.2.3 From 3198bf4944edd8f25996c2b4c4516f606165af59 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 2 Mar 2016 15:19:22 +0100 Subject: Add explicit and make public headers compile with -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Cleaned up placement of * and & in parameters as a drive-by. Added explicit where it was missing as a drive-by. This is not a source-incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Task-number: QTBUG-45291 Change-Id: If81ed0c71393aee21d347f5ade4bf3fcc07cd82f Reviewed-by: Yoann Lopes --- src/multimedia/audio/qaudiodecoder.h | 2 +- src/multimedia/audio/qaudioinput.h | 4 ++-- src/multimedia/audio/qaudiooutput.h | 4 ++-- src/multimedia/audio/qaudioprobe.h | 2 +- src/multimedia/audio/qaudiosystemplugin.h | 2 +- src/multimedia/audio/qsound.h | 2 +- src/multimedia/audio/qsoundeffect.h | 2 +- src/multimedia/camera/qcamera.h | 8 ++++---- src/multimedia/camera/qcameraexposure.h | 8 ++++---- src/multimedia/camera/qcameraimagecapture.h | 4 ++-- src/multimedia/controls/qaudiodecodercontrol.h | 2 +- src/multimedia/controls/qaudioencodersettingscontrol.h | 4 ++-- src/multimedia/controls/qaudioinputselectorcontrol.h | 2 +- src/multimedia/controls/qaudiooutputselectorcontrol.h | 2 +- src/multimedia/controls/qaudiorolecontrol.h | 2 +- src/multimedia/controls/qcameracapturebufferformatcontrol.h | 2 +- src/multimedia/controls/qcameracapturedestinationcontrol.h | 2 +- src/multimedia/controls/qcameracontrol.h | 2 +- src/multimedia/controls/qcameraexposurecontrol.h | 2 +- src/multimedia/controls/qcamerafeedbackcontrol.h | 2 +- src/multimedia/controls/qcameraflashcontrol.h | 2 +- src/multimedia/controls/qcamerafocuscontrol.h | 2 +- src/multimedia/controls/qcameraimagecapturecontrol.h | 2 +- src/multimedia/controls/qcameraimageprocessingcontrol.h | 2 +- src/multimedia/controls/qcamerainfocontrol.h | 2 +- src/multimedia/controls/qcameralockscontrol.h | 2 +- src/multimedia/controls/qcameraviewfindersettingscontrol.h | 4 ++-- src/multimedia/controls/qcamerazoomcontrol.h | 2 +- src/multimedia/controls/qimageencodercontrol.h | 4 ++-- src/multimedia/controls/qmediaaudioprobecontrol.h | 2 +- src/multimedia/controls/qmediaavailabilitycontrol.h | 2 +- src/multimedia/controls/qmediacontainercontrol.h | 2 +- src/multimedia/controls/qmediagaplessplaybackcontrol.h | 2 +- src/multimedia/controls/qmedianetworkaccesscontrol.h | 2 +- src/multimedia/controls/qmediaplayercontrol.h | 2 +- src/multimedia/controls/qmediarecordercontrol.h | 2 +- src/multimedia/controls/qmediastreamscontrol.h | 2 +- src/multimedia/controls/qmediavideoprobecontrol.h | 2 +- src/multimedia/controls/qmetadatareadercontrol.h | 2 +- src/multimedia/controls/qmetadatawritercontrol.h | 2 +- src/multimedia/controls/qradiodatacontrol.h | 2 +- src/multimedia/controls/qradiotunercontrol.h | 2 +- src/multimedia/controls/qvideodeviceselectorcontrol.h | 2 +- src/multimedia/controls/qvideoencodersettingscontrol.h | 6 +++--- src/multimedia/controls/qvideorenderercontrol.h | 2 +- src/multimedia/controls/qvideowindowcontrol.h | 2 +- src/multimedia/playback/qmediaplayer.h | 8 ++++---- src/multimedia/playback/qmediaplaylist.h | 10 +++++----- src/multimedia/qmediacontrol.h | 4 ++-- src/multimedia/radio/qradiodata.h | 2 +- src/multimedia/radio/qradiotuner.h | 2 +- src/multimedia/recording/qaudiorecorder.h | 2 +- src/multimedia/recording/qmediarecorder.h | 10 +++++----- src/multimedia/video/qabstractvideofilter.h | 2 +- src/multimedia/video/qabstractvideosurface.h | 2 +- src/multimedia/video/qvideoprobe.h | 2 +- src/multimediawidgets/qcameraviewfinder.h | 2 +- src/multimediawidgets/qgraphicsvideoitem.h | 4 ++-- src/multimediawidgets/qvideowidget.h | 2 +- src/multimediawidgets/qvideowidgetcontrol.h | 2 +- 60 files changed, 87 insertions(+), 87 deletions(-) diff --git a/src/multimedia/audio/qaudiodecoder.h b/src/multimedia/audio/qaudiodecoder.h index fd54670cf..aef5427fd 100644 --- a/src/multimedia/audio/qaudiodecoder.h +++ b/src/multimedia/audio/qaudiodecoder.h @@ -69,7 +69,7 @@ public: ServiceMissingError }; - QAudioDecoder(QObject *parent = 0); + explicit QAudioDecoder(QObject *parent = Q_NULLPTR); ~QAudioDecoder(); static QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs = QStringList()); diff --git a/src/multimedia/audio/qaudioinput.h b/src/multimedia/audio/qaudioinput.h index bb809251c..6effa788f 100644 --- a/src/multimedia/audio/qaudioinput.h +++ b/src/multimedia/audio/qaudioinput.h @@ -56,8 +56,8 @@ class Q_MULTIMEDIA_EXPORT QAudioInput : public QObject Q_OBJECT public: - explicit QAudioInput(const QAudioFormat &format = QAudioFormat(), QObject *parent = 0); - explicit QAudioInput(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = 0); + explicit QAudioInput(const QAudioFormat &format = QAudioFormat(), QObject *parent = Q_NULLPTR); + explicit QAudioInput(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = Q_NULLPTR); ~QAudioInput(); QAudioFormat format() const; diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h index b36a30948..c05e34264 100644 --- a/src/multimedia/audio/qaudiooutput.h +++ b/src/multimedia/audio/qaudiooutput.h @@ -56,8 +56,8 @@ class Q_MULTIMEDIA_EXPORT QAudioOutput : public QObject Q_OBJECT public: - explicit QAudioOutput(const QAudioFormat &format = QAudioFormat(), QObject *parent = 0); - explicit QAudioOutput(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = 0); + explicit QAudioOutput(const QAudioFormat &format = QAudioFormat(), QObject *parent = Q_NULLPTR); + explicit QAudioOutput(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = Q_NULLPTR); ~QAudioOutput(); QAudioFormat format() const; diff --git a/src/multimedia/audio/qaudioprobe.h b/src/multimedia/audio/qaudioprobe.h index f462f7aa7..c1efc275a 100644 --- a/src/multimedia/audio/qaudioprobe.h +++ b/src/multimedia/audio/qaudioprobe.h @@ -47,7 +47,7 @@ class Q_MULTIMEDIA_EXPORT QAudioProbe : public QObject { Q_OBJECT public: - explicit QAudioProbe(QObject *parent = 0); + explicit QAudioProbe(QObject *parent = Q_NULLPTR); ~QAudioProbe(); bool setSource(QMediaObject *source); diff --git a/src/multimedia/audio/qaudiosystemplugin.h b/src/multimedia/audio/qaudiosystemplugin.h index 2ee170e38..dafe7e166 100644 --- a/src/multimedia/audio/qaudiosystemplugin.h +++ b/src/multimedia/audio/qaudiosystemplugin.h @@ -72,7 +72,7 @@ class Q_MULTIMEDIA_EXPORT QAudioSystemPlugin : public QObject, public QAudioSyst Q_INTERFACES(QAudioSystemFactoryInterface) public: - QAudioSystemPlugin(QObject *parent = 0); + explicit QAudioSystemPlugin(QObject *parent = Q_NULLPTR); ~QAudioSystemPlugin(); virtual QList availableDevices(QAudio::Mode) const = 0; diff --git a/src/multimedia/audio/qsound.h b/src/multimedia/audio/qsound.h index 0ac65010e..559000d5d 100644 --- a/src/multimedia/audio/qsound.h +++ b/src/multimedia/audio/qsound.h @@ -52,7 +52,7 @@ public: static void play(const QString& filename); - explicit QSound(const QString& filename, QObject* parent = 0); + explicit QSound(const QString &filename, QObject *parent = Q_NULLPTR); ~QSound(); int loops() const; diff --git a/src/multimedia/audio/qsoundeffect.h b/src/multimedia/audio/qsoundeffect.h index fa6425589..40d17a7e7 100644 --- a/src/multimedia/audio/qsoundeffect.h +++ b/src/multimedia/audio/qsoundeffect.h @@ -74,7 +74,7 @@ public: Error }; - explicit QSoundEffect(QObject *parent = 0); + explicit QSoundEffect(QObject *parent = Q_NULLPTR); ~QSoundEffect(); static QStringList supportedMimeTypes(); diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h index ea81c02c4..2b4a058d8 100644 --- a/src/multimedia/camera/qcamera.h +++ b/src/multimedia/camera/qcamera.h @@ -159,10 +159,10 @@ public: FrontFace }; - QCamera(QObject *parent = 0); - QCamera(const QByteArray& deviceName, QObject *parent = 0); - QCamera(const QCameraInfo& cameraInfo, QObject *parent = 0); - QCamera(QCamera::Position position, QObject *parent = 0); + explicit QCamera(QObject *parent = Q_NULLPTR); + explicit QCamera(const QByteArray& deviceName, QObject *parent = Q_NULLPTR); + explicit QCamera(const QCameraInfo& cameraInfo, QObject *parent = Q_NULLPTR); + explicit QCamera(QCamera::Position position, QObject *parent = Q_NULLPTR); ~QCamera(); #if QT_DEPRECATED_SINCE(5, 3) diff --git a/src/multimedia/camera/qcameraexposure.h b/src/multimedia/camera/qcameraexposure.h index fa781b8fc..fc81a44b8 100644 --- a/src/multimedia/camera/qcameraexposure.h +++ b/src/multimedia/camera/qcameraexposure.h @@ -129,9 +129,9 @@ public: qreal requestedAperture() const; qreal requestedShutterSpeed() const; - QList supportedIsoSensitivities(bool *continuous = 0) const; - QList supportedApertures(bool * continuous = 0) const; - QList supportedShutterSpeeds(bool *continuous = 0) const; + QList supportedIsoSensitivities(bool *continuous = Q_NULLPTR) const; + QList supportedApertures(bool *continuous = Q_NULLPTR) const; + QList supportedShutterSpeeds(bool *continuous = Q_NULLPTR) const; public Q_SLOTS: void setFlashMode(FlashModes mode); @@ -162,7 +162,7 @@ Q_SIGNALS: private: friend class QCamera; friend class QCameraPrivate; - explicit QCameraExposure(QCamera *parent = 0); + explicit QCameraExposure(QCamera *parent = Q_NULLPTR); virtual ~QCameraExposure(); Q_DISABLE_COPY(QCameraExposure) diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h index c75d6c622..a8d2d4abc 100644 --- a/src/multimedia/camera/qcameraimagecapture.h +++ b/src/multimedia/camera/qcameraimagecapture.h @@ -81,7 +81,7 @@ public: }; Q_DECLARE_FLAGS(CaptureDestinations, CaptureDestination) - QCameraImageCapture(QMediaObject *mediaObject, QObject *parent = 0); + explicit QCameraImageCapture(QMediaObject *mediaObject, QObject *parent = Q_NULLPTR); ~QCameraImageCapture(); bool isAvailable() const; @@ -98,7 +98,7 @@ public: QString imageCodecDescription(const QString &codecName) const; QList supportedResolutions(const QImageEncoderSettings &settings = QImageEncoderSettings(), - bool *continuous = 0) const; + bool *continuous = Q_NULLPTR) const; QImageEncoderSettings encodingSettings() const; void setEncodingSettings(const QImageEncoderSettings& settings); diff --git a/src/multimedia/controls/qaudiodecodercontrol.h b/src/multimedia/controls/qaudiodecodercontrol.h index f319f7414..2d5912165 100644 --- a/src/multimedia/controls/qaudiodecodercontrol.h +++ b/src/multimedia/controls/qaudiodecodercontrol.h @@ -86,7 +86,7 @@ Q_SIGNALS: void durationChanged(qint64 duration); protected: - QAudioDecoderControl(QObject* parent = 0); + explicit QAudioDecoderControl(QObject *parent = Q_NULLPTR); }; #define QAudioDecoderControl_iid "org.qt-project.qt.audiodecodercontrol/5.0" diff --git a/src/multimedia/controls/qaudioencodersettingscontrol.h b/src/multimedia/controls/qaudioencodersettingscontrol.h index ebaf92333..e17377f40 100644 --- a/src/multimedia/controls/qaudioencodersettingscontrol.h +++ b/src/multimedia/controls/qaudioencodersettingscontrol.h @@ -61,13 +61,13 @@ public: virtual QString codecDescription(const QString &codecName) const = 0; virtual QList supportedSampleRates(const QAudioEncoderSettings &settings, - bool *continuous = 0) const = 0; + bool *continuous = Q_NULLPTR) const = 0; virtual QAudioEncoderSettings audioSettings() const = 0; virtual void setAudioSettings(const QAudioEncoderSettings&) = 0; protected: - QAudioEncoderSettingsControl(QObject *parent = 0); + explicit QAudioEncoderSettingsControl(QObject *parent = Q_NULLPTR); }; #define QAudioEncoderSettingsControl_iid "org.qt-project.qt.audioencodersettingscontrol/5.0" diff --git a/src/multimedia/controls/qaudioinputselectorcontrol.h b/src/multimedia/controls/qaudioinputselectorcontrol.h index d37481243..ebed8002e 100644 --- a/src/multimedia/controls/qaudioinputselectorcontrol.h +++ b/src/multimedia/controls/qaudioinputselectorcontrol.h @@ -62,7 +62,7 @@ Q_SIGNALS: void availableInputsChanged(); protected: - QAudioInputSelectorControl(QObject *parent = 0); + explicit QAudioInputSelectorControl(QObject *parent = Q_NULLPTR); }; #define QAudioInputSelectorControl_iid "org.qt-project.qt.audioinputselectorcontrol/5.0" diff --git a/src/multimedia/controls/qaudiooutputselectorcontrol.h b/src/multimedia/controls/qaudiooutputselectorcontrol.h index 132d90d7d..3abfd1571 100644 --- a/src/multimedia/controls/qaudiooutputselectorcontrol.h +++ b/src/multimedia/controls/qaudiooutputselectorcontrol.h @@ -62,7 +62,7 @@ Q_SIGNALS: void availableOutputsChanged(); protected: - QAudioOutputSelectorControl(QObject *parent = 0); + explicit QAudioOutputSelectorControl(QObject *parent = Q_NULLPTR); }; #define QAudioOutputSelectorControl_iid "org.qt-project.qt.audiooutputselectorcontrol/5.0" diff --git a/src/multimedia/controls/qaudiorolecontrol.h b/src/multimedia/controls/qaudiorolecontrol.h index 983b2aed0..1ae1378c8 100644 --- a/src/multimedia/controls/qaudiorolecontrol.h +++ b/src/multimedia/controls/qaudiorolecontrol.h @@ -58,7 +58,7 @@ Q_SIGNALS: void audioRoleChanged(QAudio::Role role); protected: - explicit QAudioRoleControl(QObject *parent = 0); + explicit QAudioRoleControl(QObject *parent = Q_NULLPTR); }; #define QAudioRoleControl_iid "org.qt-project.qt.audiorolecontrol/5.6" diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.h b/src/multimedia/controls/qcameracapturebufferformatcontrol.h index 2f699c651..8be7f36c5 100644 --- a/src/multimedia/controls/qcameracapturebufferformatcontrol.h +++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.h @@ -56,7 +56,7 @@ Q_SIGNALS: void bufferFormatChanged(QVideoFrame::PixelFormat); protected: - QCameraCaptureBufferFormatControl(QObject* parent = 0); + explicit QCameraCaptureBufferFormatControl(QObject *parent = Q_NULLPTR); }; #define QCameraCaptureBufferFormatControl_iid "org.qt-project.qt.cameracapturebufferformatcontrol/5.0" diff --git a/src/multimedia/controls/qcameracapturedestinationcontrol.h b/src/multimedia/controls/qcameracapturedestinationcontrol.h index efe7f0234..a5238add4 100644 --- a/src/multimedia/controls/qcameracapturedestinationcontrol.h +++ b/src/multimedia/controls/qcameracapturedestinationcontrol.h @@ -56,7 +56,7 @@ Q_SIGNALS: void captureDestinationChanged(QCameraImageCapture::CaptureDestinations); protected: - QCameraCaptureDestinationControl(QObject* parent = 0); + explicit QCameraCaptureDestinationControl(QObject *parent = Q_NULLPTR); }; #define QCameraCaptureDestinationControl_iid "org.qt-project.qt.cameracapturedestinationcontrol/5.0" diff --git a/src/multimedia/controls/qcameracontrol.h b/src/multimedia/controls/qcameracontrol.h index ec7c2017c..6b1cc9f30 100644 --- a/src/multimedia/controls/qcameracontrol.h +++ b/src/multimedia/controls/qcameracontrol.h @@ -77,7 +77,7 @@ Q_SIGNALS: void captureModeChanged(QCamera::CaptureModes); protected: - QCameraControl(QObject* parent = 0); + explicit QCameraControl(QObject *parent = Q_NULLPTR); }; #define QCameraControl_iid "org.qt-project.qt.cameracontrol/5.0" diff --git a/src/multimedia/controls/qcameraexposurecontrol.h b/src/multimedia/controls/qcameraexposurecontrol.h index 6f7ef4698..b905d378f 100644 --- a/src/multimedia/controls/qcameraexposurecontrol.h +++ b/src/multimedia/controls/qcameraexposurecontrol.h @@ -81,7 +81,7 @@ Q_SIGNALS: void parameterRangeChanged(int parameter); protected: - QCameraExposureControl(QObject* parent = 0); + explicit QCameraExposureControl(QObject *parent = Q_NULLPTR); }; #define QCameraExposureControl_iid "org.qt-project.qt.cameraexposurecontrol/5.0" diff --git a/src/multimedia/controls/qcamerafeedbackcontrol.h b/src/multimedia/controls/qcamerafeedbackcontrol.h index 44ba9dda1..d256e52ad 100644 --- a/src/multimedia/controls/qcamerafeedbackcontrol.h +++ b/src/multimedia/controls/qcamerafeedbackcontrol.h @@ -78,7 +78,7 @@ public: virtual bool setEventFeedbackSound(EventType, const QString &filePath) = 0; protected: - QCameraFeedbackControl(QObject* parent = 0); + explicit QCameraFeedbackControl(QObject *parent = Q_NULLPTR); }; #define QCameraFeedbackControl_iid "org.qt-project.qt.camerafeedbackcontrol/5.0" diff --git a/src/multimedia/controls/qcameraflashcontrol.h b/src/multimedia/controls/qcameraflashcontrol.h index 653321e36..d00b7356a 100644 --- a/src/multimedia/controls/qcameraflashcontrol.h +++ b/src/multimedia/controls/qcameraflashcontrol.h @@ -62,7 +62,7 @@ Q_SIGNALS: void flashReady(bool); protected: - QCameraFlashControl(QObject* parent = 0); + explicit QCameraFlashControl(QObject *parent = Q_NULLPTR); }; #define QCameraFlashControl_iid "org.qt-project.qt.cameraflashcontrol/5.0" diff --git a/src/multimedia/controls/qcamerafocuscontrol.h b/src/multimedia/controls/qcamerafocuscontrol.h index 868f5e493..3562fb8e2 100644 --- a/src/multimedia/controls/qcamerafocuscontrol.h +++ b/src/multimedia/controls/qcamerafocuscontrol.h @@ -71,7 +71,7 @@ Q_SIGNALS: void focusZonesChanged(); protected: - QCameraFocusControl(QObject* parent = 0); + explicit QCameraFocusControl(QObject *parent = Q_NULLPTR); }; #define QCameraFocusControl_iid "org.qt-project.qt.camerafocuscontrol/5.0" diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.h b/src/multimedia/controls/qcameraimagecapturecontrol.h index 93ec9a7da..bd8e31c84 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.h +++ b/src/multimedia/controls/qcameraimagecapturecontrol.h @@ -74,7 +74,7 @@ Q_SIGNALS: void error(int id, int error, const QString &errorString); protected: - QCameraImageCaptureControl(QObject* parent = 0); + explicit QCameraImageCaptureControl(QObject *parent = Q_NULLPTR); }; #define QCameraImageCaptureControl_iid "org.qt-project.qt.cameraimagecapturecontrol/5.0" diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.h b/src/multimedia/controls/qcameraimageprocessingcontrol.h index 01686dc46..d0a1c16b3 100644 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.h +++ b/src/multimedia/controls/qcameraimageprocessingcontrol.h @@ -76,7 +76,7 @@ public: virtual void setParameter(ProcessingParameter parameter, const QVariant &value) = 0; protected: - QCameraImageProcessingControl(QObject* parent = 0); + explicit QCameraImageProcessingControl(QObject *parent = Q_NULLPTR); }; #define QCameraImageProcessingControl_iid "org.qt-project.qt.cameraimageprocessingcontrol/5.0" diff --git a/src/multimedia/controls/qcamerainfocontrol.h b/src/multimedia/controls/qcamerainfocontrol.h index c9a564ea7..acdb30dca 100644 --- a/src/multimedia/controls/qcamerainfocontrol.h +++ b/src/multimedia/controls/qcamerainfocontrol.h @@ -52,7 +52,7 @@ public: virtual int cameraOrientation(const QString &deviceName) const = 0; protected: - QCameraInfoControl(QObject *parent = 0); + explicit QCameraInfoControl(QObject *parent = Q_NULLPTR); }; #define QCameraInfoControl_iid "org.qt-project.qt.camerainfocontrol/5.3" diff --git a/src/multimedia/controls/qcameralockscontrol.h b/src/multimedia/controls/qcameralockscontrol.h index 421563758..1fe8273b8 100644 --- a/src/multimedia/controls/qcameralockscontrol.h +++ b/src/multimedia/controls/qcameralockscontrol.h @@ -61,7 +61,7 @@ Q_SIGNALS: void lockStatusChanged(QCamera::LockType type, QCamera::LockStatus status, QCamera::LockChangeReason reason); protected: - QCameraLocksControl(QObject* parent = 0); + explicit QCameraLocksControl(QObject *parent = Q_NULLPTR); }; #define QCameraLocksControl_iid "org.qt-project.qt.cameralockscontrol/5.0" diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.h b/src/multimedia/controls/qcameraviewfindersettingscontrol.h index a48ae450e..84fe2d46b 100644 --- a/src/multimedia/controls/qcameraviewfindersettingscontrol.h +++ b/src/multimedia/controls/qcameraviewfindersettingscontrol.h @@ -64,7 +64,7 @@ public: virtual void setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value) = 0; protected: - QCameraViewfinderSettingsControl(QObject *parent = 0); + explicit QCameraViewfinderSettingsControl(QObject *parent = Q_NULLPTR); }; #define QCameraViewfinderSettingsControl_iid "org.qt-project.qt.cameraviewfindersettingscontrol/5.0" @@ -86,7 +86,7 @@ public: virtual void setViewfinderSettings(const QCameraViewfinderSettings &settings) = 0; protected: - QCameraViewfinderSettingsControl2(QObject *parent = 0); + explicit QCameraViewfinderSettingsControl2(QObject *parent = Q_NULLPTR); }; #define QCameraViewfinderSettingsControl2_iid "org.qt-project.qt.cameraviewfindersettingscontrol2/5.5" diff --git a/src/multimedia/controls/qcamerazoomcontrol.h b/src/multimedia/controls/qcamerazoomcontrol.h index 07575a25c..f16052c92 100644 --- a/src/multimedia/controls/qcamerazoomcontrol.h +++ b/src/multimedia/controls/qcamerazoomcontrol.h @@ -69,7 +69,7 @@ Q_SIGNALS: void currentDigitalZoomChanged(qreal digitalZoom); protected: - QCameraZoomControl(QObject* parent = 0); + explicit QCameraZoomControl(QObject *parent = Q_NULLPTR); }; #define QCameraZoomControl_iid "org.qt-project.qt.camerazoomcontrol/5.0" diff --git a/src/multimedia/controls/qimageencodercontrol.h b/src/multimedia/controls/qimageencodercontrol.h index f448754e6..6dccd966e 100644 --- a/src/multimedia/controls/qimageencodercontrol.h +++ b/src/multimedia/controls/qimageencodercontrol.h @@ -62,13 +62,13 @@ public: virtual QString imageCodecDescription(const QString &codecName) const = 0; virtual QList supportedResolutions(const QImageEncoderSettings &settings, - bool *continuous = 0) const = 0; + bool *continuous = Q_NULLPTR) const = 0; virtual QImageEncoderSettings imageSettings() const = 0; virtual void setImageSettings(const QImageEncoderSettings &settings) = 0; protected: - QImageEncoderControl(QObject *parent = 0); + explicit QImageEncoderControl(QObject *parent = Q_NULLPTR); }; #define QImageEncoderControl_iid "org.qt-project.qt.imageencodercontrol/5.0" diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.h b/src/multimedia/controls/qmediaaudioprobecontrol.h index b6961ec94..04ec7aca9 100644 --- a/src/multimedia/controls/qmediaaudioprobecontrol.h +++ b/src/multimedia/controls/qmediaaudioprobecontrol.h @@ -50,7 +50,7 @@ Q_SIGNALS: void flush(); protected: - explicit QMediaAudioProbeControl(QObject *parent = 0); + explicit QMediaAudioProbeControl(QObject *parent = Q_NULLPTR); }; #define QMediaAudioProbeControl_iid "org.qt-project.qt.mediaaudioprobecontrol/5.0" diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.h b/src/multimedia/controls/qmediaavailabilitycontrol.h index 1f788f82f..eddadb441 100644 --- a/src/multimedia/controls/qmediaavailabilitycontrol.h +++ b/src/multimedia/controls/qmediaavailabilitycontrol.h @@ -56,7 +56,7 @@ Q_SIGNALS: void availabilityChanged(QMultimedia::AvailabilityStatus availability); protected: - QMediaAvailabilityControl(QObject* parent = 0); + explicit QMediaAvailabilityControl(QObject *parent = Q_NULLPTR); }; #define QMediaAvailabilityControl_iid "org.qt-project.qt.mediaavailabilitycontrol/5.0" diff --git a/src/multimedia/controls/qmediacontainercontrol.h b/src/multimedia/controls/qmediacontainercontrol.h index 83b201cdd..ae15967e9 100644 --- a/src/multimedia/controls/qmediacontainercontrol.h +++ b/src/multimedia/controls/qmediacontainercontrol.h @@ -56,7 +56,7 @@ public: virtual QString containerDescription(const QString &formatMimeType) const = 0; protected: - QMediaContainerControl(QObject *parent = 0); + explicit QMediaContainerControl(QObject *parent = Q_NULLPTR); }; #define QMediaContainerControl_iid "org.qt-project.qt.mediacontainercontrol/5.0" diff --git a/src/multimedia/controls/qmediagaplessplaybackcontrol.h b/src/multimedia/controls/qmediagaplessplaybackcontrol.h index 79bb6168f..9158aed74 100644 --- a/src/multimedia/controls/qmediagaplessplaybackcontrol.h +++ b/src/multimedia/controls/qmediagaplessplaybackcontrol.h @@ -60,7 +60,7 @@ Q_SIGNALS: void advancedToNextMedia(); protected: - QMediaGaplessPlaybackControl(QObject* parent = 0); + explicit QMediaGaplessPlaybackControl(QObject *parent = Q_NULLPTR); }; #define QMediaGaplessPlaybackControl_iid "org.qt-project.qt.mediagaplessplaybackcontrol/5.0" diff --git a/src/multimedia/controls/qmedianetworkaccesscontrol.h b/src/multimedia/controls/qmedianetworkaccesscontrol.h index 2db6b4a60..f70cbedde 100644 --- a/src/multimedia/controls/qmedianetworkaccesscontrol.h +++ b/src/multimedia/controls/qmedianetworkaccesscontrol.h @@ -59,7 +59,7 @@ Q_SIGNALS: void configurationChanged(const QNetworkConfiguration& configuration); protected: - QMediaNetworkAccessControl(QObject *parent = 0); + explicit QMediaNetworkAccessControl(QObject *parent = Q_NULLPTR); }; #define QMediaNetworkAccessControl_iid "org.qt-project.qt.medianetworkaccesscontrol/5.0" diff --git a/src/multimedia/controls/qmediaplayercontrol.h b/src/multimedia/controls/qmediaplayercontrol.h index 61622aa8e..b8f915a3d 100644 --- a/src/multimedia/controls/qmediaplayercontrol.h +++ b/src/multimedia/controls/qmediaplayercontrol.h @@ -104,7 +104,7 @@ Q_SIGNALS: void error(int error, const QString &errorString); protected: - QMediaPlayerControl(QObject* parent = 0); + explicit QMediaPlayerControl(QObject *parent = Q_NULLPTR); }; #define QMediaPlayerControl_iid "org.qt-project.qt.mediaplayercontrol/5.0" diff --git a/src/multimedia/controls/qmediarecordercontrol.h b/src/multimedia/controls/qmediarecordercontrol.h index c3afa9b58..58e4d5aa1 100644 --- a/src/multimedia/controls/qmediarecordercontrol.h +++ b/src/multimedia/controls/qmediarecordercontrol.h @@ -82,7 +82,7 @@ public Q_SLOTS: virtual void setVolume(qreal volume) = 0; protected: - QMediaRecorderControl(QObject* parent = 0); + explicit QMediaRecorderControl(QObject *parent = Q_NULLPTR); }; #define QMediaRecorderControl_iid "org.qt-project.qt.mediarecordercontrol/5.0" diff --git a/src/multimedia/controls/qmediastreamscontrol.h b/src/multimedia/controls/qmediastreamscontrol.h index ca2ad53bc..eee2803c7 100644 --- a/src/multimedia/controls/qmediastreamscontrol.h +++ b/src/multimedia/controls/qmediastreamscontrol.h @@ -67,7 +67,7 @@ Q_SIGNALS: void activeStreamsChanged(); protected: - QMediaStreamsControl(QObject *parent = 0); + explicit QMediaStreamsControl(QObject *parent = Q_NULLPTR); }; #define QMediaStreamsControl_iid "org.qt-project.qt.mediastreamscontrol/5.0" diff --git a/src/multimedia/controls/qmediavideoprobecontrol.h b/src/multimedia/controls/qmediavideoprobecontrol.h index 78f89400d..8a81ab9aa 100644 --- a/src/multimedia/controls/qmediavideoprobecontrol.h +++ b/src/multimedia/controls/qmediavideoprobecontrol.h @@ -52,7 +52,7 @@ Q_SIGNALS: void flush(); protected: - explicit QMediaVideoProbeControl(QObject *parent = 0); + explicit QMediaVideoProbeControl(QObject *parent = Q_NULLPTR); }; #define QMediaVideoProbeControl_iid "org.qt-project.qt.mediavideoprobecontrol/5.0" diff --git a/src/multimedia/controls/qmetadatareadercontrol.h b/src/multimedia/controls/qmetadatareadercontrol.h index 7cf8a5f0d..285e08dd5 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.h +++ b/src/multimedia/controls/qmetadatareadercontrol.h @@ -65,7 +65,7 @@ Q_SIGNALS: void metaDataAvailableChanged(bool available); protected: - QMetaDataReaderControl(QObject *parent = 0); + explicit QMetaDataReaderControl(QObject *parent = Q_NULLPTR); }; #define QMetaDataReaderControl_iid "org.qt-project.qt.metadatareadercontrol/5.0" diff --git a/src/multimedia/controls/qmetadatawritercontrol.h b/src/multimedia/controls/qmetadatawritercontrol.h index 7b6cef9c4..970feab0c 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.h +++ b/src/multimedia/controls/qmetadatawritercontrol.h @@ -68,7 +68,7 @@ Q_SIGNALS: void metaDataAvailableChanged(bool available); protected: - QMetaDataWriterControl(QObject *parent = 0); + explicit QMetaDataWriterControl(QObject *parent = Q_NULLPTR); }; #define QMetaDataWriterControl_iid "org.qt-project.qt.metadatawritercontrol/5.0" diff --git a/src/multimedia/controls/qradiodatacontrol.h b/src/multimedia/controls/qradiodatacontrol.h index e519c414e..91fa2a69b 100644 --- a/src/multimedia/controls/qradiodatacontrol.h +++ b/src/multimedia/controls/qradiodatacontrol.h @@ -70,7 +70,7 @@ Q_SIGNALS: void error(QRadioData::Error err); protected: - QRadioDataControl(QObject *parent = 0); + explicit QRadioDataControl(QObject *parent = Q_NULLPTR); }; #define QRadioDataControl_iid "org.qt-project.qt.radiodatacontrol/5.0" diff --git a/src/multimedia/controls/qradiotunercontrol.h b/src/multimedia/controls/qradiotunercontrol.h index fbcad5167..273120f5a 100644 --- a/src/multimedia/controls/qradiotunercontrol.h +++ b/src/multimedia/controls/qradiotunercontrol.h @@ -101,7 +101,7 @@ Q_SIGNALS: void antennaConnectedChanged(bool connectionStatus); protected: - QRadioTunerControl(QObject *parent = 0); + explicit QRadioTunerControl(QObject *parent = Q_NULLPTR); }; #define QRadioTunerControl_iid "org.qt-project.qt.radiotunercontrol/5.0" diff --git a/src/multimedia/controls/qvideodeviceselectorcontrol.h b/src/multimedia/controls/qvideodeviceselectorcontrol.h index 840c31efa..655b70dba 100644 --- a/src/multimedia/controls/qvideodeviceselectorcontrol.h +++ b/src/multimedia/controls/qvideodeviceselectorcontrol.h @@ -65,7 +65,7 @@ Q_SIGNALS: void devicesChanged(); protected: - QVideoDeviceSelectorControl(QObject *parent = 0); + explicit QVideoDeviceSelectorControl(QObject *parent = Q_NULLPTR); }; #define QVideoDeviceSelectorControl_iid "org.qt-project.qt.videodeviceselectorcontrol/5.0" diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.h b/src/multimedia/controls/qvideoencodersettingscontrol.h index 8638c3886..7b80cd51f 100644 --- a/src/multimedia/controls/qvideoencodersettingscontrol.h +++ b/src/multimedia/controls/qvideoencodersettingscontrol.h @@ -59,10 +59,10 @@ public: virtual ~QVideoEncoderSettingsControl(); virtual QList supportedResolutions(const QVideoEncoderSettings &settings, - bool *continuous = 0) const = 0; + bool *continuous = Q_NULLPTR) const = 0; virtual QList supportedFrameRates(const QVideoEncoderSettings &settings, - bool *continuous = 0) const = 0; + bool *continuous = Q_NULLPTR) const = 0; virtual QStringList supportedVideoCodecs() const = 0; virtual QString videoCodecDescription(const QString &codecName) const = 0; @@ -71,7 +71,7 @@ public: virtual void setVideoSettings(const QVideoEncoderSettings &settings) = 0; protected: - QVideoEncoderSettingsControl(QObject *parent = 0); + explicit QVideoEncoderSettingsControl(QObject *parent = Q_NULLPTR); }; #define QVideoEncoderSettingsControl_iid "org.qt-project.qt.videoencodersettingscontrol/5.0" diff --git a/src/multimedia/controls/qvideorenderercontrol.h b/src/multimedia/controls/qvideorenderercontrol.h index 754d83049..132a7cf07 100644 --- a/src/multimedia/controls/qvideorenderercontrol.h +++ b/src/multimedia/controls/qvideorenderercontrol.h @@ -50,7 +50,7 @@ public: virtual void setSurface(QAbstractVideoSurface *surface) = 0; protected: - QVideoRendererControl(QObject *parent = 0); + explicit QVideoRendererControl(QObject *parent = Q_NULLPTR); }; #define QVideoRendererControl_iid "org.qt-project.qt.videorenderercontrol/5.0" diff --git a/src/multimedia/controls/qvideowindowcontrol.h b/src/multimedia/controls/qvideowindowcontrol.h index c57eef070..ca786dbcd 100644 --- a/src/multimedia/controls/qvideowindowcontrol.h +++ b/src/multimedia/controls/qvideowindowcontrol.h @@ -88,7 +88,7 @@ Q_SIGNALS: void nativeSizeChanged(); protected: - QVideoWindowControl(QObject *parent = 0); + explicit QVideoWindowControl(QObject *parent = Q_NULLPTR); }; #define QVideoWindowControl_iid "org.qt-project.qt.videowindowcontrol/5.0" diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index 437bf58ad..30a08f88b 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -113,13 +113,13 @@ public: MediaIsPlaylist }; - QMediaPlayer(QObject *parent = 0, Flags flags = 0); + explicit QMediaPlayer(QObject *parent = Q_NULLPTR, Flags flags = Flags()); ~QMediaPlayer(); static QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs = QStringList(), - Flags flags = 0); - static QStringList supportedMimeTypes(Flags flags = 0); + Flags flags = Flags()); + static QStringList supportedMimeTypes(Flags flags = Flags()); void setVideoOutput(QVideoWidget *); void setVideoOutput(QGraphicsVideoItem *); @@ -168,7 +168,7 @@ public Q_SLOTS: void setPlaybackRate(qreal rate); - void setMedia(const QMediaContent &media, QIODevice *stream = 0); + void setMedia(const QMediaContent &media, QIODevice *stream = Q_NULLPTR); void setPlaylist(QMediaPlaylist *playlist); void setNetworkConfigurations(const QList &configurations); diff --git a/src/multimedia/playback/qmediaplaylist.h b/src/multimedia/playback/qmediaplaylist.h index 1388ac10f..3b6551ead 100644 --- a/src/multimedia/playback/qmediaplaylist.h +++ b/src/multimedia/playback/qmediaplaylist.h @@ -61,7 +61,7 @@ public: enum PlaybackMode { CurrentItemOnce, CurrentItemInLoop, Sequential, Loop, Random }; enum Error { NoError, FormatError, FormatNotSupportedError, NetworkError, AccessDeniedError }; - QMediaPlaylist(QObject *parent = 0); + explicit QMediaPlaylist(QObject *parent = Q_NULLPTR); virtual ~QMediaPlaylist(); QMediaObject *mediaObject() const; @@ -89,11 +89,11 @@ public: bool removeMedia(int start, int end); bool clear(); - void load(const QNetworkRequest &request, const char *format = 0); - void load(const QUrl &location, const char *format = 0); - void load(QIODevice * device, const char *format = 0); + void load(const QNetworkRequest &request, const char *format = Q_NULLPTR); + void load(const QUrl &location, const char *format = Q_NULLPTR); + void load(QIODevice *device, const char *format = Q_NULLPTR); - bool save(const QUrl &location, const char *format = 0); + bool save(const QUrl &location, const char *format = Q_NULLPTR); bool save(QIODevice * device, const char *format); Error error() const; diff --git a/src/multimedia/qmediacontrol.h b/src/multimedia/qmediacontrol.h index 480d96ea3..95c3e1029 100644 --- a/src/multimedia/qmediacontrol.h +++ b/src/multimedia/qmediacontrol.h @@ -53,8 +53,8 @@ public: ~QMediaControl(); protected: - QMediaControl(QObject *parent = 0); - QMediaControl(QMediaControlPrivate &dd, QObject *parent = 0); + explicit QMediaControl(QObject *parent = Q_NULLPTR); + explicit QMediaControl(QMediaControlPrivate &dd, QObject *parent = Q_NULLPTR); QMediaControlPrivate *d_ptr; diff --git a/src/multimedia/radio/qradiodata.h b/src/multimedia/radio/qradiodata.h index edc7acb49..894a9dd34 100644 --- a/src/multimedia/radio/qradiodata.h +++ b/src/multimedia/radio/qradiodata.h @@ -76,7 +76,7 @@ public: College }; - QRadioData(QMediaObject *mediaObject, QObject *parent = 0); + explicit QRadioData(QMediaObject *mediaObject, QObject *parent = Q_NULLPTR); ~QRadioData(); QMultimedia::AvailabilityStatus availability() const; diff --git a/src/multimedia/radio/qradiotuner.h b/src/multimedia/radio/qradiotuner.h index 7a394d0aa..09b8757a5 100644 --- a/src/multimedia/radio/qradiotuner.h +++ b/src/multimedia/radio/qradiotuner.h @@ -72,7 +72,7 @@ public: enum StereoMode { ForceStereo, ForceMono, Auto }; enum SearchMode { SearchFast, SearchGetStationId }; - QRadioTuner(QObject *parent = 0); + explicit QRadioTuner(QObject *parent = Q_NULLPTR); ~QRadioTuner(); QMultimedia::AvailabilityStatus availability() const; diff --git a/src/multimedia/recording/qaudiorecorder.h b/src/multimedia/recording/qaudiorecorder.h index 24b79ea30..d63a44b6a 100644 --- a/src/multimedia/recording/qaudiorecorder.h +++ b/src/multimedia/recording/qaudiorecorder.h @@ -56,7 +56,7 @@ class Q_MULTIMEDIA_EXPORT QAudioRecorder : public QMediaRecorder Q_OBJECT Q_PROPERTY(QString audioInput READ audioInput WRITE setAudioInput NOTIFY audioInputChanged) public: - QAudioRecorder(QObject *parent = 0); + explicit QAudioRecorder(QObject *parent = Q_NULLPTR); ~QAudioRecorder(); QStringList audioInputs() const; diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h index 6f275b305..71e8ab5cf 100644 --- a/src/multimedia/recording/qmediarecorder.h +++ b/src/multimedia/recording/qmediarecorder.h @@ -100,7 +100,7 @@ public: OutOfSpaceError }; - QMediaRecorder(QMediaObject *mediaObject, QObject *parent = 0); + explicit QMediaRecorder(QMediaObject *mediaObject, QObject *parent = Q_NULLPTR); ~QMediaRecorder(); QMediaObject *mediaObject() const; @@ -131,16 +131,16 @@ public: QString audioCodecDescription(const QString &codecName) const; QList supportedAudioSampleRates(const QAudioEncoderSettings &settings = QAudioEncoderSettings(), - bool *continuous = 0) const; + bool *continuous = Q_NULLPTR) const; QStringList supportedVideoCodecs() const; QString videoCodecDescription(const QString &codecName) const; QList supportedResolutions(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), - bool *continuous = 0) const; + bool *continuous = Q_NULLPTR) const; QList supportedFrameRates(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), - bool *continuous = 0) const; + bool *continuous = Q_NULLPTR) const; QAudioEncoderSettings audioSettings() const; QVideoEncoderSettings videoSettings() const; @@ -187,7 +187,7 @@ Q_SIGNALS: void availabilityChanged(QMultimedia::AvailabilityStatus availability); protected: - QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = 0); + QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = Q_NULLPTR); bool setMediaObject(QMediaObject *object); QMediaRecorderPrivate *d_ptr; diff --git a/src/multimedia/video/qabstractvideofilter.h b/src/multimedia/video/qabstractvideofilter.h index 77f035e0a..51b6ee7b4 100644 --- a/src/multimedia/video/qabstractvideofilter.h +++ b/src/multimedia/video/qabstractvideofilter.h @@ -62,7 +62,7 @@ class Q_MULTIMEDIA_EXPORT QAbstractVideoFilter : public QObject Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged) public: - explicit QAbstractVideoFilter(QObject *parent = 0); + explicit QAbstractVideoFilter(QObject *parent = Q_NULLPTR); ~QAbstractVideoFilter(); bool isActive() const; diff --git a/src/multimedia/video/qabstractvideosurface.h b/src/multimedia/video/qabstractvideosurface.h index f8aefc3ba..e2b684125 100644 --- a/src/multimedia/video/qabstractvideosurface.h +++ b/src/multimedia/video/qabstractvideosurface.h @@ -58,7 +58,7 @@ public: ResourceError }; - explicit QAbstractVideoSurface(QObject *parent = 0); + explicit QAbstractVideoSurface(QObject *parent = Q_NULLPTR); ~QAbstractVideoSurface(); virtual QList supportedPixelFormats( diff --git a/src/multimedia/video/qvideoprobe.h b/src/multimedia/video/qvideoprobe.h index 5de594f06..d3c8dbfda 100644 --- a/src/multimedia/video/qvideoprobe.h +++ b/src/multimedia/video/qvideoprobe.h @@ -47,7 +47,7 @@ class Q_MULTIMEDIA_EXPORT QVideoProbe : public QObject { Q_OBJECT public: - explicit QVideoProbe(QObject *parent = 0); + explicit QVideoProbe(QObject *parent = Q_NULLPTR); ~QVideoProbe(); bool setSource(QMediaObject *source); diff --git a/src/multimediawidgets/qcameraviewfinder.h b/src/multimediawidgets/qcameraviewfinder.h index 65556c417..9bb2bda43 100644 --- a/src/multimediawidgets/qcameraviewfinder.h +++ b/src/multimediawidgets/qcameraviewfinder.h @@ -55,7 +55,7 @@ class Q_MULTIMEDIAWIDGETS_EXPORT QCameraViewfinder : public QVideoWidget { Q_OBJECT public: - QCameraViewfinder(QWidget *parent = 0); + explicit QCameraViewfinder(QWidget *parent = Q_NULLPTR); ~QCameraViewfinder(); QMediaObject *mediaObject() const; diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h index 76dbae2e0..e43de0157 100644 --- a/src/multimediawidgets/qgraphicsvideoitem.h +++ b/src/multimediawidgets/qgraphicsvideoitem.h @@ -57,7 +57,7 @@ class Q_MULTIMEDIAWIDGETS_EXPORT QGraphicsVideoItem : public QGraphicsObject, pu Q_PROPERTY(QSizeF size READ size WRITE setSize) Q_PROPERTY(QSizeF nativeSize READ nativeSize NOTIFY nativeSizeChanged) public: - QGraphicsVideoItem(QGraphicsItem *parent = 0); + explicit QGraphicsVideoItem(QGraphicsItem *parent = Q_NULLPTR); ~QGraphicsVideoItem(); QMediaObject *mediaObject() const; @@ -75,7 +75,7 @@ public: QRectF boundingRect() const; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR); Q_SIGNALS: void nativeSizeChanged(const QSizeF &size); diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h index 2f5eade30..1e67de886 100644 --- a/src/multimediawidgets/qvideowidget.h +++ b/src/multimediawidgets/qvideowidget.h @@ -58,7 +58,7 @@ class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWidget : public QWidget, public QMediaBin Q_PROPERTY(int saturation READ saturation WRITE setSaturation NOTIFY saturationChanged) public: - QVideoWidget(QWidget *parent = 0); + explicit QVideoWidget(QWidget *parent = Q_NULLPTR); ~QVideoWidget(); QMediaObject *mediaObject() const; diff --git a/src/multimediawidgets/qvideowidgetcontrol.h b/src/multimediawidgets/qvideowidgetcontrol.h index c77d646db..dca9f2dd0 100644 --- a/src/multimediawidgets/qvideowidgetcontrol.h +++ b/src/multimediawidgets/qvideowidgetcontrol.h @@ -79,7 +79,7 @@ Q_SIGNALS: void saturationChanged(int saturation); protected: - QVideoWidgetControl(QObject *parent = 0); + explicit QVideoWidgetControl(QObject *parent = Q_NULLPTR); }; #define QVideoWidgetControl_iid "org.qt-project.qt.videowidgetcontrol/5.0" -- cgit v1.2.3