From d09f9443b64365f845f98283ccfd7b79a2930421 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 3 Dec 2012 21:41:03 +0100 Subject: [PATCH 01/33] remove pointless QT..sources references there is no point to use this for in-module references. cleaning it out in an attempt to purge the constants entirely. Change-Id: Id160b6241126717dc412d80aeaa13df3cbf8fa17 Reviewed-by: Joerg Bornemann --- .../unit/qdeclarativeaudio/qdeclarativeaudio.pro | 8 ++++---- .../unit/qdeclarativevideo/qdeclarativevideo.pro | 12 ++++++------ tests/auto/unit/qmediaplaylist/qmediaplaylist.pro | 6 +++--- tests/auto/unit/qwavedecoder/qwavedecoder.pro | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro index 756ba3f6..37c5fd33 100644 --- a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro +++ b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro @@ -5,12 +5,12 @@ QT += multimedia-private qml testlib CONFIG += no_private_qt_headers_warning HEADERS += \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativeaudio_p.h \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediametadata_p.h + ../../../../src/imports/multimedia/qdeclarativeaudio_p.h \ + ../../../../src/imports/multimedia/qdeclarativemediametadata_p.h SOURCES += \ tst_qdeclarativeaudio.cpp \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativeaudio.cpp + ../../../../src/imports/multimedia/qdeclarativeaudio.cpp -INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia +INCLUDEPATH += ../../../../src/imports/multimedia DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro index c9435ea7..2ab722c7 100644 --- a/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro +++ b/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro @@ -5,15 +5,15 @@ QT += multimedia-private qml testlib CONFIG += no_private_qt_headers_warning HEADERS += \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativevideo_p.h \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediabase_p.h \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediametadata_p.h + ../../../../src/imports/multimedia/qdeclarativevideo_p.h \ + ../../../../src/imports/multimedia/qdeclarativemediabase_p.h \ + ../../../../src/imports/multimedia/qdeclarativemediametadata_p.h SOURCES += \ tst_qdeclarativevideo.cpp \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativevideo.cpp \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediabase.cpp + ../../../../src/imports/multimedia/qdeclarativevideo.cpp \ + ../../../../src/imports/multimedia/qdeclarativemediabase.cpp -INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia +INCLUDEPATH += ../../../../src/imports/multimedia QT+=widgets DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro index 16618eaa..ed54c478 100644 --- a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro +++ b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro @@ -7,13 +7,13 @@ QT += multimedia-private testlib CONFIG += no_private_qt_headers_warning HEADERS += \ - $$QT.multimedia.sources/../plugins/m3u/qm3uhandler.h + ../../../../src/plugins/m3u/qm3uhandler.h SOURCES += \ tst_qmediaplaylist.cpp \ - $$QT.multimedia.sources/../plugins/m3u/qm3uhandler.cpp + ../../../../src/plugins/m3u/qm3uhandler.cpp -INCLUDEPATH += $$QT.multimedia.sources/../plugins/m3u +INCLUDEPATH += ../../../../src/plugins/m3u TESTDATA += testdata/* DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qwavedecoder/qwavedecoder.pro b/tests/auto/unit/qwavedecoder/qwavedecoder.pro index 18e74db0..1b6af7e8 100644 --- a/tests/auto/unit/qwavedecoder/qwavedecoder.pro +++ b/tests/auto/unit/qwavedecoder/qwavedecoder.pro @@ -1,7 +1,7 @@ TARGET = tst_qwavedecoder -HEADERS += $$QT.multimedia.sources/audio/qwavedecoder_p.h +HEADERS += ../../../../src/multimedia/audio/qwavedecoder_p.h SOURCES += tst_qwavedecoder.cpp \ - $$QT.multimedia.sources/audio/qwavedecoder_p.cpp + ../../../../src/multimedia/audio/qwavedecoder_p.cpp QT += multimedia-private testlib network CONFIG += no_private_qt_headers_warning testcase From 90c8ba233b77ed74012de3b5598a7617672e9d31 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 4 Dec 2012 11:31:18 +0100 Subject: [PATCH 02/33] sync.profile: Point dependencies to 'refs/heads/stable' We should test stable branches against stable branches only. At some point we should automate the merges from dev->stable->release and decide how to handle possible merge conflicts. This is good enough for the time being. Change-Id: I87e02c9d323b524898d93fb5d1d4387218a984c5 Reviewed-by: Janne Anttila --- sync.profile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sync.profile b/sync.profile index da532432..f33c9a8c 100644 --- a/sync.profile +++ b/sync.profile @@ -20,8 +20,8 @@ # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) # %dependencies = ( - "qtbase" => "refs/heads/master", - "qtxmlpatterns" => "refs/heads/master", - "qtdeclarative" => "refs/heads/master", - "qtjsbackend" => "refs/heads/master", + "qtbase" => "refs/heads/stable", + "qtxmlpatterns" => "refs/heads/stable", + "qtdeclarative" => "refs/heads/stable", + "qtjsbackend" => "refs/heads/stable", ); From 6b4994c265889db2058b7d5850b51ddfc5478754 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 5 Dec 2012 13:03:09 +0100 Subject: [PATCH 03/33] centralize and fixup example sources install targets This follows suit with aeb036e in qtbase. Change-Id: Ie8580d0a1f38ab9858b0e44c9f99bdc552a1752a Reviewed-by: Oswald Buddenhagen Reviewed-by: hjk --- .qmake.conf | 1 + examples/audiodecoder/audiodecoder.pro | 20 ------------ examples/audiodevices/audiodevices.pro | 19 ----------- examples/audioengine/audioengine.pro | 10 ------ examples/audioinput/audioinput.pro | 15 --------- examples/audiooutput/audiooutput.pro | 15 --------- .../customvideosurface/customvideosurface.pro | 8 ----- .../customvideowidget/customvideowidget.pro | 21 ------------ .../declarative-camera/declarative-camera.pro | 13 -------- .../declarative-radio/declarative-radio.pro | 12 ------- examples/examples.pro | 30 +----------------- .../audiodecoder/audiodecoder.cpp | 0 .../audiodecoder/audiodecoder.h | 0 .../multimedia/audiodecoder/audiodecoder.pro | 17 ++++++++++ .../{ => multimedia}/audiodecoder/main.cpp | 0 .../audiodecoder/wavefilewriter.cpp | 0 .../audiodecoder/wavefilewriter.h | 0 .../audiodevices/audiodevices.cpp | 0 .../audiodevices/audiodevices.h | 0 .../multimedia/audiodevices/audiodevices.pro | 16 ++++++++++ .../audiodevices/audiodevicesbase.ui | 0 .../audiodevices/doc/images/audiodevices.png | Bin .../audiodevices/doc/src/audiodevices.qdoc | 0 .../{ => multimedia}/audiodevices/main.cpp | 0 .../multimedia/audioengine/audioengine.pro | 6 ++++ .../audioengine/doc/src/audioengine.qdoc | 0 .../audioengine/qml/audioengine.qml | 0 .../audioengine/qml/audioengine.qmlproject | 0 .../audioengine/qml/content/MyAudioEngine.qml | 0 .../audioinput/audioinput.cpp | 0 .../{ => multimedia}/audioinput/audioinput.h | 0 examples/multimedia/audioinput/audioinput.pro | 12 +++++++ .../doc/images/audioinput-example.png | Bin .../audioinput/doc/src/audioinput.qdoc | 0 examples/{ => multimedia}/audioinput/main.cpp | 0 .../audiooutput/audiooutput.cpp | 0 .../audiooutput/audiooutput.h | 0 .../multimedia/audiooutput/audiooutput.pro | 12 +++++++ .../doc/images/audiooutput-example.png | Bin .../audiooutput/doc/src/audiooutput.qdoc | 0 .../{ => multimedia}/audiooutput/main.cpp | 0 .../audiorecorder/audiorecorder.cpp | 0 .../audiorecorder/audiorecorder.h | 0 .../audiorecorder/audiorecorder.pro | 7 ++-- .../audiorecorder/audiorecorder.ui | 0 .../audiorecorder/audiorecorder_small.ui | 0 .../doc/images/audiorecorder.png | Bin .../audiorecorder/doc/src/audiorecorder.qdoc | 0 .../{ => multimedia}/audiorecorder/main.cpp | 0 .../audiorecorder/qaudiolevel.cpp | 0 .../audiorecorder/qaudiolevel.h | 0 .../declarative-radio/declarative-radio.pro | 9 ++++++ .../declarative-radio/declarative-radio.qrc | 0 .../doc/images/declarative-radio-example.png | Bin .../doc/src/declarative-radio.qdoc | 0 .../declarative-radio/main.cpp | 0 .../declarative-radio/view.qml | 0 examples/multimedia/multimedia.pro | 25 +++++++++++++++ examples/{ => multimedia}/radio/main.cpp | 0 examples/{ => multimedia}/radio/radio.cpp | 0 examples/{ => multimedia}/radio/radio.h | 0 examples/multimedia/radio/radio.pro | 16 ++++++++++ .../spectrum/3rdparty/fftreal/Array.h | 0 .../spectrum/3rdparty/fftreal/Array.hpp | 0 .../spectrum/3rdparty/fftreal/DynArray.h | 0 .../spectrum/3rdparty/fftreal/DynArray.hpp | 0 .../spectrum/3rdparty/fftreal/FFTReal.dsp | 0 .../spectrum/3rdparty/fftreal/FFTReal.dsw | 0 .../spectrum/3rdparty/fftreal/FFTReal.h | 0 .../spectrum/3rdparty/fftreal/FFTReal.hpp | 0 .../spectrum/3rdparty/fftreal/FFTRealFixLen.h | 0 .../3rdparty/fftreal/FFTRealFixLen.hpp | 0 .../3rdparty/fftreal/FFTRealFixLenParam.h | 0 .../3rdparty/fftreal/FFTRealPassDirect.h | 0 .../3rdparty/fftreal/FFTRealPassDirect.hpp | 0 .../3rdparty/fftreal/FFTRealPassInverse.h | 0 .../3rdparty/fftreal/FFTRealPassInverse.hpp | 0 .../spectrum/3rdparty/fftreal/FFTRealSelect.h | 0 .../3rdparty/fftreal/FFTRealSelect.hpp | 0 .../3rdparty/fftreal/FFTRealUseTrigo.h | 0 .../3rdparty/fftreal/FFTRealUseTrigo.hpp | 0 .../spectrum/3rdparty/fftreal/OscSinCos.h | 0 .../spectrum/3rdparty/fftreal/OscSinCos.hpp | 0 .../spectrum/3rdparty/fftreal/TestAccuracy.h | 0 .../3rdparty/fftreal/TestAccuracy.hpp | 0 .../3rdparty/fftreal/TestHelperFixLen.h | 0 .../3rdparty/fftreal/TestHelperFixLen.hpp | 0 .../3rdparty/fftreal/TestHelperNormal.h | 0 .../3rdparty/fftreal/TestHelperNormal.hpp | 0 .../spectrum/3rdparty/fftreal/TestSpeed.h | 0 .../spectrum/3rdparty/fftreal/TestSpeed.hpp | 0 .../3rdparty/fftreal/TestWhiteNoiseGen.h | 0 .../3rdparty/fftreal/TestWhiteNoiseGen.hpp | 0 .../3rdparty/fftreal/bwins/fftrealu.def | 0 .../spectrum/3rdparty/fftreal/def.h | 0 .../3rdparty/fftreal/eabi/fftrealu.def | 0 .../spectrum/3rdparty/fftreal/fftreal.pas | 0 .../spectrum/3rdparty/fftreal/fftreal.pro | 9 ++---- .../3rdparty/fftreal/fftreal_wrapper.cpp | 0 .../3rdparty/fftreal/fftreal_wrapper.h | 0 .../spectrum/3rdparty/fftreal/license.txt | 0 .../spectrum/3rdparty/fftreal/readme.txt | 0 .../fftreal/stopwatch/ClockCycleCounter.cpp | 0 .../fftreal/stopwatch/ClockCycleCounter.h | 0 .../fftreal/stopwatch/ClockCycleCounter.hpp | 0 .../3rdparty/fftreal/stopwatch/Int64.h | 0 .../3rdparty/fftreal/stopwatch/StopWatch.cpp | 0 .../3rdparty/fftreal/stopwatch/StopWatch.h | 0 .../3rdparty/fftreal/stopwatch/StopWatch.hpp | 0 .../spectrum/3rdparty/fftreal/stopwatch/def.h | 0 .../spectrum/3rdparty/fftreal/stopwatch/fnc.h | 0 .../3rdparty/fftreal/stopwatch/fnc.hpp | 0 .../spectrum/3rdparty/fftreal/test.cpp | 0 .../spectrum/3rdparty/fftreal/test_fnc.h | 0 .../spectrum/3rdparty/fftreal/test_fnc.hpp | 0 .../spectrum/3rdparty/fftreal/test_settings.h | 0 .../spectrum/3rdparty/fftreal/testapp.dpr | 0 examples/{ => multimedia}/spectrum/README.txt | 0 examples/{ => multimedia}/spectrum/TODO.txt | 0 .../{ => multimedia}/spectrum/app/.gitignore | 0 .../{ => multimedia}/spectrum/app/app.pro | 10 ++---- .../{ => multimedia}/spectrum/app/engine.cpp | 0 .../{ => multimedia}/spectrum/app/engine.h | 0 .../spectrum/app/frequencyspectrum.cpp | 0 .../spectrum/app/frequencyspectrum.h | 0 .../spectrum/app/images/record.png | Bin .../spectrum/app/images/settings.png | Bin .../spectrum/app/levelmeter.cpp | 0 .../spectrum/app/levelmeter.h | 0 .../{ => multimedia}/spectrum/app/main.cpp | 0 .../spectrum/app/mainwidget.cpp | 0 .../spectrum/app/mainwidget.h | 0 .../spectrum/app/progressbar.cpp | 0 .../spectrum/app/progressbar.h | 0 .../spectrum/app/settingsdialog.cpp | 0 .../spectrum/app/settingsdialog.h | 0 .../spectrum/app/spectrograph.cpp | 0 .../spectrum/app/spectrograph.h | 0 .../{ => multimedia}/spectrum/app/spectrum.h | 0 .../spectrum/app/spectrum.qrc | 0 .../spectrum/app/spectrumanalyser.cpp | 0 .../spectrum/app/spectrumanalyser.h | 0 .../spectrum/app/tonegenerator.cpp | 0 .../spectrum/app/tonegenerator.h | 0 .../spectrum/app/tonegeneratordialog.cpp | 0 .../spectrum/app/tonegeneratordialog.h | 0 .../{ => multimedia}/spectrum/app/utils.cpp | 0 .../{ => multimedia}/spectrum/app/utils.h | 0 .../spectrum/app/waveform.cpp | 0 .../{ => multimedia}/spectrum/app/waveform.h | 0 .../{ => multimedia}/spectrum/app/wavfile.cpp | 0 .../{ => multimedia}/spectrum/app/wavfile.h | 0 .../spectrum/doc/images/spectrum-demo.png | Bin .../spectrum/doc/src/spectrum.qdoc | 0 .../{ => multimedia}/spectrum/spectrum.pri | 0 .../{ => multimedia}/spectrum/spectrum.pro | 3 -- .../video/doc/images/qmlvideo-menu.png | Bin .../video/doc/images/qmlvideo-overlay.png | Bin .../doc/images/qmlvideofx-camera-glow.png | Bin .../doc/images/qmlvideofx-camera-magnify.png | Bin .../doc/images/qmlvideofx-effects-menu.png | Bin .../doc/images/qmlvideofx-source-menu.png | Bin .../images/qmlvideofx-video-edgedetection.png | Bin .../doc/images/qmlvideofx-video-pagecurl.png | Bin .../video/doc/images/video-qml-paint-rate.png | Bin .../video/doc/src/qmlvideo.qdoc | 0 .../video/doc/src/qmlvideofx.qdoc | 0 .../doc/src/video-qml-paint-rate.qdocinc | 0 .../video/qmlvideo/images/close.png | Bin .../video/qmlvideo/images/folder.png | Bin .../video/qmlvideo/images/leaves.jpg | Bin .../video/qmlvideo/images/progress_handle.svg | 0 .../images/progress_handle_pressed.svg | 0 .../video/qmlvideo/images/titlebar.png | Bin .../video/qmlvideo/images/titlebar.sci | 0 .../video/qmlvideo/images/up.png | Bin .../{ => multimedia}/video/qmlvideo/main.cpp | 0 .../video/qmlvideo/qml/qmlvideo/Button.qml | 0 .../qmlvideo/qml/qmlvideo/CameraBasic.qml | 0 .../qmlvideo/qml/qmlvideo/CameraDrag.qml | 0 .../qmlvideo/qml/qmlvideo/CameraDummy.qml | 0 .../qml/qmlvideo/CameraFullScreen.qml | 0 .../qml/qmlvideo/CameraFullScreenInverted.qml | 0 .../qmlvideo/qml/qmlvideo/CameraItem.qml | 0 .../qmlvideo/qml/qmlvideo/CameraMove.qml | 0 .../qmlvideo/qml/qmlvideo/CameraOverlay.qml | 0 .../qmlvideo/qml/qmlvideo/CameraResize.qml | 0 .../qmlvideo/qml/qmlvideo/CameraRotate.qml | 0 .../qmlvideo/qml/qmlvideo/CameraSpin.qml | 0 .../video/qmlvideo/qml/qmlvideo/Content.qml | 0 .../qml/qmlvideo/DisableScreenSaver.qml | 0 .../qmlvideo/qml/qmlvideo/ErrorDialog.qml | 0 .../qmlvideo/qml/qmlvideo/FileBrowser.qml | 0 .../video/qmlvideo/qml/qmlvideo/Scene.qml | 0 .../qmlvideo/qml/qmlvideo/SceneBasic.qml | 0 .../video/qmlvideo/qml/qmlvideo/SceneDrag.qml | 0 .../qmlvideo/qml/qmlvideo/SceneFullScreen.qml | 0 .../qml/qmlvideo/SceneFullScreenInverted.qml | 0 .../video/qmlvideo/qml/qmlvideo/SceneMove.qml | 0 .../qmlvideo/qml/qmlvideo/SceneMulti.qml | 0 .../qmlvideo/qml/qmlvideo/SceneOverlay.qml | 0 .../qmlvideo/qml/qmlvideo/SceneResize.qml | 0 .../qmlvideo/qml/qmlvideo/SceneRotate.qml | 0 .../qml/qmlvideo/SceneSelectionPanel.qml | 0 .../video/qmlvideo/qml/qmlvideo/SceneSpin.qml | 0 .../qmlvideo/qml/qmlvideo/SeekControl.qml | 0 .../qmlvideo/qml/qmlvideo/VideoBasic.qml | 0 .../video/qmlvideo/qml/qmlvideo/VideoDrag.qml | 0 .../qmlvideo/qml/qmlvideo/VideoDummy.qml | 0 .../qmlvideo/qml/qmlvideo/VideoFillMode.qml | 0 .../qmlvideo/qml/qmlvideo/VideoFullScreen.qml | 0 .../qml/qmlvideo/VideoFullScreenInverted.qml | 0 .../video/qmlvideo/qml/qmlvideo/VideoItem.qml | 0 .../qmlvideo/qml/qmlvideo/VideoMetadata.qml | 0 .../video/qmlvideo/qml/qmlvideo/VideoMove.qml | 0 .../qmlvideo/qml/qmlvideo/VideoOverlay.qml | 0 .../qml/qmlvideo/VideoPlaybackRate.qml | 0 .../qmlvideo/qml/qmlvideo/VideoResize.qml | 0 .../qmlvideo/qml/qmlvideo/VideoRotate.qml | 0 .../video/qmlvideo/qml/qmlvideo/VideoSeek.qml | 0 .../video/qmlvideo/qml/qmlvideo/VideoSpin.qml | 0 .../video/qmlvideo/qml/qmlvideo/main.qml | 0 .../qmlapplicationviewer.cpp | 0 .../qmlapplicationviewer.h | 0 .../qmlapplicationviewer.pri | 0 .../video/qmlvideo/qmlvideo.png | Bin .../video/qmlvideo/qmlvideo.pro | 7 ++-- .../video/qmlvideo/qmlvideo.qrc | 0 .../video/qmlvideo/qmlvideo.svg | 0 .../{ => multimedia}/video/qmlvideo/trace.h | 0 .../video/qmlvideofx/filereader.cpp | 0 .../video/qmlvideofx/filereader.h | 0 .../video/qmlvideofx/images/close.png | Bin .../video/qmlvideofx/images/folder.png | Bin .../video/qmlvideofx/images/qt-logo.png | Bin .../video/qmlvideofx/images/titlebar.png | Bin .../video/qmlvideofx/images/titlebar.sci | 0 .../video/qmlvideofx/images/up.png | Bin .../video/qmlvideofx/main.cpp | 0 .../qmlvideofx/qml/qmlvideofx/Button.qml | 0 .../qmlvideofx/qml/qmlvideofx/Content.qml | 0 .../qml/qmlvideofx/ContentCamera.qml | 0 .../qml/qmlvideofx/ContentImage.qml | 0 .../qml/qmlvideofx/ContentVideo.qml | 0 .../qml/qmlvideofx/DisableScreenSaver.qml | 0 .../qmlvideofx/qml/qmlvideofx/Divider.qml | 0 .../qmlvideofx/qml/qmlvideofx/Effect.qml | 0 .../qml/qmlvideofx/EffectBillboard.qml | 0 .../qml/qmlvideofx/EffectBlackAndWhite.qml | 0 .../qml/qmlvideofx/EffectEmboss.qml | 0 .../qml/qmlvideofx/EffectGaussianBlur.qml | 0 .../qmlvideofx/qml/qmlvideofx/EffectGlow.qml | 0 .../qml/qmlvideofx/EffectIsolate.qml | 0 .../qml/qmlvideofx/EffectMagnify.qml | 0 .../qml/qmlvideofx/EffectPageCurl.qml | 0 .../qml/qmlvideofx/EffectPassThrough.qml | 0 .../qml/qmlvideofx/EffectPixelate.qml | 0 .../qml/qmlvideofx/EffectPosterize.qml | 0 .../qml/qmlvideofx/EffectRipple.qml | 0 .../qml/qmlvideofx/EffectSelectionPanel.qml | 0 .../qmlvideofx/qml/qmlvideofx/EffectSepia.qml | 0 .../qml/qmlvideofx/EffectSharpen.qml | 0 .../qml/qmlvideofx/EffectShockwave.qml | 0 .../qmlvideofx/EffectSobelEdgeDetection1.qml | 0 .../qmlvideofx/EffectSobelEdgeDetection2.qml | 0 .../qml/qmlvideofx/EffectTiltShift.qml | 0 .../qmlvideofx/qml/qmlvideofx/EffectToon.qml | 0 .../qml/qmlvideofx/EffectVignette.qml | 0 .../qml/qmlvideofx/EffectWarhol.qml | 0 .../qml/qmlvideofx/EffectWobble.qml | 0 .../qmlvideofx/qml/qmlvideofx/FileBrowser.qml | 0 .../qmlvideofx/qml/qmlvideofx/FileOpen.qml | 0 .../qml/qmlvideofx/HintedMouseArea.qml | 0 .../qml/qmlvideofx/ParameterPanel.qml | 0 .../qmlvideofx/qml/qmlvideofx/Slider.qml | 0 .../qml/qmlvideofx/main-largescreen.qml | 0 .../qml/qmlvideofx/main-smallscreen.qml | 0 .../qmlapplicationviewer.cpp | 0 .../qmlapplicationviewer.h | 0 .../qmlapplicationviewer.pri | 0 .../video/qmlvideofx/qmlvideofx.png | Bin .../video/qmlvideofx/qmlvideofx.pro | 7 ++-- .../video/qmlvideofx/qmlvideofx.qrc | 0 .../video/qmlvideofx/qmlvideofx.svg | 0 .../video/qmlvideofx/shaders/billboard.fsh | 0 .../qmlvideofx/shaders/blackandwhite.fsh | 0 .../video/qmlvideofx/shaders/emboss.fsh | 0 .../qmlvideofx/shaders/gaussianblur_h.fsh | 0 .../qmlvideofx/shaders/gaussianblur_v.fsh | 0 .../video/qmlvideofx/shaders/glow.fsh | 0 .../video/qmlvideofx/shaders/isolate.fsh | 0 .../video/qmlvideofx/shaders/magnify.fsh | 0 .../video/qmlvideofx/shaders/pagecurl.fsh | 0 .../video/qmlvideofx/shaders/pixelate.fsh | 0 .../video/qmlvideofx/shaders/posterize.fsh | 0 .../video/qmlvideofx/shaders/ripple.fsh | 0 .../qmlvideofx/shaders/selectionpanel.fsh | 0 .../video/qmlvideofx/shaders/sepia.fsh | 0 .../video/qmlvideofx/shaders/sharpen.fsh | 0 .../video/qmlvideofx/shaders/shockwave.fsh | 0 .../shaders/sobeledgedetection1.fsh | 0 .../shaders/sobeledgedetection2.fsh | 0 .../video/qmlvideofx/shaders/tiltshift.fsh | 0 .../video/qmlvideofx/shaders/toon.fsh | 0 .../video/qmlvideofx/shaders/vignette.fsh | 0 .../video/qmlvideofx/shaders/warhol.fsh | 0 .../video/qmlvideofx/shaders/wobble.fsh | 0 .../{ => multimedia}/video/qmlvideofx/trace.h | 0 .../frequencymonitor/frequencymonitor.cpp | 0 .../frequencymonitor/frequencymonitor.h | 0 .../frequencymonitor/frequencymonitor.pri | 0 .../frequencymonitordeclarative.cpp | 0 .../frequencymonitordeclarative.pri | 0 .../qml/frequencymonitor/FrequencyItem.qml | 0 .../performancemonitor/performancemonitor.cpp | 0 .../performancemonitor/performancemonitor.h | 0 .../performancemonitor/performancemonitor.pri | 0 .../performancemonitordeclarative.cpp | 0 .../performancemonitordeclarative.h | 0 .../performancemonitordeclarative.pri | 0 .../performancemonitor/PerformanceItem.qml | 0 examples/multimedia/video/video.pro | 4 +++ .../{ => multimediawidgets}/camera/camera.cpp | 0 .../{ => multimediawidgets}/camera/camera.h | 0 .../{ => multimediawidgets}/camera/camera.pro | 7 ++-- .../{ => multimediawidgets}/camera/camera.ui | 0 .../camera/doc/images/camera-example.png | Bin .../camera/doc/src/camera.qdoc | 0 .../camera/imagesettings.cpp | 0 .../camera/imagesettings.h | 0 .../camera/imagesettings.ui | 0 .../{ => multimediawidgets}/camera/main.cpp | 0 .../camera/videosettings.cpp | 0 .../camera/videosettings.h | 0 .../camera/videosettings.ui | 0 .../customvideoitem/customvideoitem.pro | 7 ++-- .../customvideoitem/main.cpp | 0 .../customvideoitem/videoitem.cpp | 0 .../customvideoitem/videoitem.h | 0 .../customvideoitem/videoplayer.cpp | 0 .../customvideoitem/videoplayer.h | 0 .../customvideosurface/customvideosurface.pro | 4 +++ .../customvideowidget/customvideowidget.pro | 18 +++++++++++ .../customvideowidget/main.cpp | 0 .../customvideowidget/videoplayer.cpp | 0 .../customvideowidget/videoplayer.h | 0 .../customvideowidget/videowidget.cpp | 0 .../customvideowidget/videowidget.h | 0 .../customvideowidget/videowidgetsurface.cpp | 0 .../customvideowidget/videowidgetsurface.h | 0 .../declarative-camera/CameraButton.qml | 0 .../CameraPropertyButton.qml | 0 .../CameraPropertyPopup.qml | 0 .../declarative-camera/FocusButton.qml | 0 .../PhotoCaptureControls.qml | 0 .../declarative-camera/PhotoPreview.qml | 0 .../VideoCaptureControls.qml | 0 .../declarative-camera/VideoPreview.qml | 0 .../declarative-camera/ZoomControl.qml | 0 .../declarative-camera/declarative-camera.pro | 10 ++++++ .../declarative-camera/declarative-camera.qml | 0 .../declarative-camera.qmlproject | 0 .../doc/images/qml-camera.png | Bin .../doc/src/declarative-camera.qdoc | 0 .../images/camera_auto_mode.png | Bin .../images/camera_camera_setting.png | Bin .../images/camera_flash_auto.png | Bin .../images/camera_flash_fill.png | Bin .../images/camera_flash_off.png | Bin .../images/camera_flash_redeye.png | Bin .../images/camera_white_balance_cloudy.png | Bin .../camera_white_balance_flourescent.png | Bin .../camera_white_balance_incandescent.png | Bin .../images/camera_white_balance_sunny.png | Bin .../declarative-camera/images/toolbutton.png | Bin .../declarative-camera/images/toolbutton.sci | 0 .../declarative-camera/qmlcamera.cpp | 0 .../multimediawidgets/multimediawidgets.pro | 18 +++++++++++ .../player/doc/src/player.qdoc | 0 .../player/histogramwidget.cpp | 0 .../player/histogramwidget.h | 0 .../{ => multimediawidgets}/player/main.cpp | 0 .../{ => multimediawidgets}/player/player.cpp | 0 .../{ => multimediawidgets}/player/player.h | 0 .../{ => multimediawidgets}/player/player.pro | 6 ++-- .../player/playercontrols.cpp | 0 .../player/playercontrols.h | 0 .../player/playlistmodel.cpp | 0 .../player/playlistmodel.h | 0 .../player/videowidget.cpp | 0 .../player/videowidget.h | 0 .../doc/images/video-videographicsitem.png | Bin .../doc/src/videographicsitem.qdoc | 0 .../videographicsitem/main.cpp | 0 .../videographicsitem/videographicsitem.pro | 14 ++++++++ .../videographicsitem/videoplayer.cpp | 0 .../videographicsitem/videoplayer.h | 0 .../doc/images/video-videowidget.png | Bin .../videowidget/doc/src/videowidget.qdoc | 0 .../videowidget/main.cpp | 0 .../videowidget/videoplayer.cpp | 0 .../videowidget/videoplayer.h | 0 .../videowidget/videowidget.pro | 16 ++++++++++ examples/radio/radio.pro | 19 ----------- examples/video/video.pro | 8 ----- .../videographicsitem/videographicsitem.pro | 17 ---------- examples/videowidget/videowidget.pro | 19 ----------- 407 files changed, 216 insertions(+), 271 deletions(-) delete mode 100644 examples/audiodecoder/audiodecoder.pro delete mode 100644 examples/audiodevices/audiodevices.pro delete mode 100644 examples/audioengine/audioengine.pro delete mode 100644 examples/audioinput/audioinput.pro delete mode 100644 examples/audiooutput/audiooutput.pro delete mode 100644 examples/customvideosurface/customvideosurface.pro delete mode 100644 examples/customvideosurface/customvideowidget/customvideowidget.pro delete mode 100644 examples/declarative-camera/declarative-camera.pro delete mode 100644 examples/declarative-radio/declarative-radio.pro rename examples/{ => multimedia}/audiodecoder/audiodecoder.cpp (100%) rename examples/{ => multimedia}/audiodecoder/audiodecoder.h (100%) create mode 100644 examples/multimedia/audiodecoder/audiodecoder.pro rename examples/{ => multimedia}/audiodecoder/main.cpp (100%) rename examples/{ => multimedia}/audiodecoder/wavefilewriter.cpp (100%) rename examples/{ => multimedia}/audiodecoder/wavefilewriter.h (100%) rename examples/{ => multimedia}/audiodevices/audiodevices.cpp (100%) rename examples/{ => multimedia}/audiodevices/audiodevices.h (100%) create mode 100644 examples/multimedia/audiodevices/audiodevices.pro rename examples/{ => multimedia}/audiodevices/audiodevicesbase.ui (100%) rename examples/{ => multimedia}/audiodevices/doc/images/audiodevices.png (100%) rename examples/{ => multimedia}/audiodevices/doc/src/audiodevices.qdoc (100%) rename examples/{ => multimedia}/audiodevices/main.cpp (100%) create mode 100644 examples/multimedia/audioengine/audioengine.pro rename examples/{ => multimedia}/audioengine/doc/src/audioengine.qdoc (100%) rename examples/{ => multimedia}/audioengine/qml/audioengine.qml (100%) rename examples/{ => multimedia}/audioengine/qml/audioengine.qmlproject (100%) rename examples/{ => multimedia}/audioengine/qml/content/MyAudioEngine.qml (100%) rename examples/{ => multimedia}/audioinput/audioinput.cpp (100%) rename examples/{ => multimedia}/audioinput/audioinput.h (100%) create mode 100644 examples/multimedia/audioinput/audioinput.pro rename examples/{ => multimedia}/audioinput/doc/images/audioinput-example.png (100%) rename examples/{ => multimedia}/audioinput/doc/src/audioinput.qdoc (100%) rename examples/{ => multimedia}/audioinput/main.cpp (100%) rename examples/{ => multimedia}/audiooutput/audiooutput.cpp (100%) rename examples/{ => multimedia}/audiooutput/audiooutput.h (100%) create mode 100644 examples/multimedia/audiooutput/audiooutput.pro rename examples/{ => multimedia}/audiooutput/doc/images/audiooutput-example.png (100%) rename examples/{ => multimedia}/audiooutput/doc/src/audiooutput.qdoc (100%) rename examples/{ => multimedia}/audiooutput/main.cpp (100%) rename examples/{ => multimedia}/audiorecorder/audiorecorder.cpp (100%) rename examples/{ => multimedia}/audiorecorder/audiorecorder.h (100%) rename examples/{ => multimedia}/audiorecorder/audiorecorder.pro (58%) rename examples/{ => multimedia}/audiorecorder/audiorecorder.ui (100%) rename examples/{ => multimedia}/audiorecorder/audiorecorder_small.ui (100%) rename examples/{ => multimedia}/audiorecorder/doc/images/audiorecorder.png (100%) rename examples/{ => multimedia}/audiorecorder/doc/src/audiorecorder.qdoc (100%) rename examples/{ => multimedia}/audiorecorder/main.cpp (100%) rename examples/{ => multimedia}/audiorecorder/qaudiolevel.cpp (100%) rename examples/{ => multimedia}/audiorecorder/qaudiolevel.h (100%) create mode 100644 examples/multimedia/declarative-radio/declarative-radio.pro rename examples/{ => multimedia}/declarative-radio/declarative-radio.qrc (100%) rename examples/{ => multimedia}/declarative-radio/doc/images/declarative-radio-example.png (100%) rename examples/{ => multimedia}/declarative-radio/doc/src/declarative-radio.qdoc (100%) rename examples/{ => multimedia}/declarative-radio/main.cpp (100%) rename examples/{ => multimedia}/declarative-radio/view.qml (100%) create mode 100644 examples/multimedia/multimedia.pro rename examples/{ => multimedia}/radio/main.cpp (100%) rename examples/{ => multimedia}/radio/radio.cpp (100%) rename examples/{ => multimedia}/radio/radio.h (100%) create mode 100644 examples/multimedia/radio/radio.pro rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/Array.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/Array.hpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/DynArray.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/DynArray.hpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/FFTReal.dsp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/FFTReal.dsw (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/FFTReal.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/FFTReal.hpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/FFTRealFixLen.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/FFTRealPassDirect.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/FFTRealPassInverse.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/FFTRealSelect.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/FFTRealSelect.hpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/OscSinCos.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/OscSinCos.hpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/TestAccuracy.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/TestAccuracy.hpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/TestHelperFixLen.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/TestHelperNormal.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/TestHelperNormal.hpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/TestSpeed.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/TestSpeed.hpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/bwins/fftrealu.def (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/def.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/eabi/fftrealu.def (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/fftreal.pas (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/fftreal.pro (75%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/fftreal_wrapper.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/license.txt (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/readme.txt (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/stopwatch/Int64.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/stopwatch/def.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/stopwatch/fnc.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/test.cpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/test_fnc.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/test_fnc.hpp (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/test_settings.h (100%) rename examples/{ => multimedia}/spectrum/3rdparty/fftreal/testapp.dpr (100%) rename examples/{ => multimedia}/spectrum/README.txt (100%) rename examples/{ => multimedia}/spectrum/TODO.txt (100%) rename examples/{ => multimedia}/spectrum/app/.gitignore (100%) rename examples/{ => multimedia}/spectrum/app/app.pro (87%) rename examples/{ => multimedia}/spectrum/app/engine.cpp (100%) rename examples/{ => multimedia}/spectrum/app/engine.h (100%) rename examples/{ => multimedia}/spectrum/app/frequencyspectrum.cpp (100%) rename examples/{ => multimedia}/spectrum/app/frequencyspectrum.h (100%) rename examples/{ => multimedia}/spectrum/app/images/record.png (100%) rename examples/{ => multimedia}/spectrum/app/images/settings.png (100%) rename examples/{ => multimedia}/spectrum/app/levelmeter.cpp (100%) rename examples/{ => multimedia}/spectrum/app/levelmeter.h (100%) rename examples/{ => multimedia}/spectrum/app/main.cpp (100%) rename examples/{ => multimedia}/spectrum/app/mainwidget.cpp (100%) rename examples/{ => multimedia}/spectrum/app/mainwidget.h (100%) rename examples/{ => multimedia}/spectrum/app/progressbar.cpp (100%) rename examples/{ => multimedia}/spectrum/app/progressbar.h (100%) rename examples/{ => multimedia}/spectrum/app/settingsdialog.cpp (100%) rename examples/{ => multimedia}/spectrum/app/settingsdialog.h (100%) rename examples/{ => multimedia}/spectrum/app/spectrograph.cpp (100%) rename examples/{ => multimedia}/spectrum/app/spectrograph.h (100%) rename examples/{ => multimedia}/spectrum/app/spectrum.h (100%) rename examples/{ => multimedia}/spectrum/app/spectrum.qrc (100%) rename examples/{ => multimedia}/spectrum/app/spectrumanalyser.cpp (100%) rename examples/{ => multimedia}/spectrum/app/spectrumanalyser.h (100%) rename examples/{ => multimedia}/spectrum/app/tonegenerator.cpp (100%) rename examples/{ => multimedia}/spectrum/app/tonegenerator.h (100%) rename examples/{ => multimedia}/spectrum/app/tonegeneratordialog.cpp (100%) rename examples/{ => multimedia}/spectrum/app/tonegeneratordialog.h (100%) rename examples/{ => multimedia}/spectrum/app/utils.cpp (100%) rename examples/{ => multimedia}/spectrum/app/utils.h (100%) rename examples/{ => multimedia}/spectrum/app/waveform.cpp (100%) rename examples/{ => multimedia}/spectrum/app/waveform.h (100%) rename examples/{ => multimedia}/spectrum/app/wavfile.cpp (100%) rename examples/{ => multimedia}/spectrum/app/wavfile.h (100%) rename examples/{ => multimedia}/spectrum/doc/images/spectrum-demo.png (100%) rename examples/{ => multimedia}/spectrum/doc/src/spectrum.qdoc (100%) rename examples/{ => multimedia}/spectrum/spectrum.pri (100%) rename examples/{ => multimedia}/spectrum/spectrum.pro (60%) rename examples/{ => multimedia}/video/doc/images/qmlvideo-menu.png (100%) rename examples/{ => multimedia}/video/doc/images/qmlvideo-overlay.png (100%) rename examples/{ => multimedia}/video/doc/images/qmlvideofx-camera-glow.png (100%) rename examples/{ => multimedia}/video/doc/images/qmlvideofx-camera-magnify.png (100%) rename examples/{ => multimedia}/video/doc/images/qmlvideofx-effects-menu.png (100%) rename examples/{ => multimedia}/video/doc/images/qmlvideofx-source-menu.png (100%) rename examples/{ => multimedia}/video/doc/images/qmlvideofx-video-edgedetection.png (100%) rename examples/{ => multimedia}/video/doc/images/qmlvideofx-video-pagecurl.png (100%) rename examples/{ => multimedia}/video/doc/images/video-qml-paint-rate.png (100%) rename examples/{ => multimedia}/video/doc/src/qmlvideo.qdoc (100%) rename examples/{ => multimedia}/video/doc/src/qmlvideofx.qdoc (100%) rename examples/{ => multimedia}/video/doc/src/video-qml-paint-rate.qdocinc (100%) rename examples/{ => multimedia}/video/qmlvideo/images/close.png (100%) rename examples/{ => multimedia}/video/qmlvideo/images/folder.png (100%) rename examples/{ => multimedia}/video/qmlvideo/images/leaves.jpg (100%) rename examples/{ => multimedia}/video/qmlvideo/images/progress_handle.svg (100%) rename examples/{ => multimedia}/video/qmlvideo/images/progress_handle_pressed.svg (100%) rename examples/{ => multimedia}/video/qmlvideo/images/titlebar.png (100%) rename examples/{ => multimedia}/video/qmlvideo/images/titlebar.sci (100%) rename examples/{ => multimedia}/video/qmlvideo/images/up.png (100%) rename examples/{ => multimedia}/video/qmlvideo/main.cpp (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/Button.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/CameraBasic.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/CameraDrag.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/CameraDummy.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/CameraItem.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/CameraMove.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/CameraResize.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/CameraRotate.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/CameraSpin.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/Content.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/FileBrowser.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/Scene.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/SceneBasic.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/SceneDrag.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/SceneMove.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/SceneMulti.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/SceneResize.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/SceneRotate.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/SceneSpin.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/SeekControl.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/VideoBasic.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/VideoDrag.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/VideoDummy.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/VideoItem.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/VideoMove.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/VideoResize.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/VideoRotate.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/VideoSeek.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/VideoSpin.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qml/qmlvideo/main.qml (100%) rename examples/{ => multimedia}/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp (100%) rename examples/{ => multimedia}/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h (100%) rename examples/{ => multimedia}/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri (100%) rename examples/{ => multimedia}/video/qmlvideo/qmlvideo.png (100%) rename examples/{ => multimedia}/video/qmlvideo/qmlvideo.pro (52%) rename examples/{ => multimedia}/video/qmlvideo/qmlvideo.qrc (100%) rename examples/{ => multimedia}/video/qmlvideo/qmlvideo.svg (100%) rename examples/{ => multimedia}/video/qmlvideo/trace.h (100%) rename examples/{ => multimedia}/video/qmlvideofx/filereader.cpp (100%) rename examples/{ => multimedia}/video/qmlvideofx/filereader.h (100%) rename examples/{ => multimedia}/video/qmlvideofx/images/close.png (100%) rename examples/{ => multimedia}/video/qmlvideofx/images/folder.png (100%) rename examples/{ => multimedia}/video/qmlvideofx/images/qt-logo.png (100%) rename examples/{ => multimedia}/video/qmlvideofx/images/titlebar.png (100%) rename examples/{ => multimedia}/video/qmlvideofx/images/titlebar.sci (100%) rename examples/{ => multimedia}/video/qmlvideofx/images/up.png (100%) rename examples/{ => multimedia}/video/qmlvideofx/main.cpp (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/Button.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/Content.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/Divider.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/Effect.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/Slider.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/main-largescreen.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qml/qmlvideofx/main-smallscreen.qml (100%) rename examples/{ => multimedia}/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp (100%) rename examples/{ => multimedia}/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h (100%) rename examples/{ => multimedia}/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri (100%) rename examples/{ => multimedia}/video/qmlvideofx/qmlvideofx.png (100%) rename examples/{ => multimedia}/video/qmlvideofx/qmlvideofx.pro (58%) rename examples/{ => multimedia}/video/qmlvideofx/qmlvideofx.qrc (100%) rename examples/{ => multimedia}/video/qmlvideofx/qmlvideofx.svg (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/billboard.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/blackandwhite.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/emboss.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/gaussianblur_h.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/gaussianblur_v.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/glow.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/isolate.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/magnify.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/pagecurl.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/pixelate.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/posterize.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/ripple.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/selectionpanel.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/sepia.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/sharpen.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/shockwave.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/sobeledgedetection1.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/sobeledgedetection2.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/tiltshift.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/toon.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/vignette.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/warhol.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/shaders/wobble.fsh (100%) rename examples/{ => multimedia}/video/qmlvideofx/trace.h (100%) rename examples/{ => multimedia}/video/snippets/frequencymonitor/frequencymonitor.cpp (100%) rename examples/{ => multimedia}/video/snippets/frequencymonitor/frequencymonitor.h (100%) rename examples/{ => multimedia}/video/snippets/frequencymonitor/frequencymonitor.pri (100%) rename examples/{ => multimedia}/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp (100%) rename examples/{ => multimedia}/video/snippets/frequencymonitor/frequencymonitordeclarative.pri (100%) rename examples/{ => multimedia}/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml (100%) rename examples/{ => multimedia}/video/snippets/performancemonitor/performancemonitor.cpp (100%) rename examples/{ => multimedia}/video/snippets/performancemonitor/performancemonitor.h (100%) rename examples/{ => multimedia}/video/snippets/performancemonitor/performancemonitor.pri (100%) rename examples/{ => multimedia}/video/snippets/performancemonitor/performancemonitordeclarative.cpp (100%) rename examples/{ => multimedia}/video/snippets/performancemonitor/performancemonitordeclarative.h (100%) rename examples/{ => multimedia}/video/snippets/performancemonitor/performancemonitordeclarative.pri (100%) rename examples/{ => multimedia}/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml (100%) create mode 100644 examples/multimedia/video/video.pro rename examples/{ => multimediawidgets}/camera/camera.cpp (100%) rename examples/{ => multimediawidgets}/camera/camera.h (100%) rename examples/{ => multimediawidgets}/camera/camera.pro (60%) rename examples/{ => multimediawidgets}/camera/camera.ui (100%) rename examples/{ => multimediawidgets}/camera/doc/images/camera-example.png (100%) rename examples/{ => multimediawidgets}/camera/doc/src/camera.qdoc (100%) rename examples/{ => multimediawidgets}/camera/imagesettings.cpp (100%) rename examples/{ => multimediawidgets}/camera/imagesettings.h (100%) rename examples/{ => multimediawidgets}/camera/imagesettings.ui (100%) rename examples/{ => multimediawidgets}/camera/main.cpp (100%) rename examples/{ => multimediawidgets}/camera/videosettings.cpp (100%) rename examples/{ => multimediawidgets}/camera/videosettings.h (100%) rename examples/{ => multimediawidgets}/camera/videosettings.ui (100%) rename examples/{ => multimediawidgets}/customvideosurface/customvideoitem/customvideoitem.pro (50%) rename examples/{ => multimediawidgets}/customvideosurface/customvideoitem/main.cpp (100%) rename examples/{ => multimediawidgets}/customvideosurface/customvideoitem/videoitem.cpp (100%) rename examples/{ => multimediawidgets}/customvideosurface/customvideoitem/videoitem.h (100%) rename examples/{ => multimediawidgets}/customvideosurface/customvideoitem/videoplayer.cpp (100%) rename examples/{ => multimediawidgets}/customvideosurface/customvideoitem/videoplayer.h (100%) create mode 100644 examples/multimediawidgets/customvideosurface/customvideosurface.pro create mode 100644 examples/multimediawidgets/customvideosurface/customvideowidget/customvideowidget.pro rename examples/{ => multimediawidgets}/customvideosurface/customvideowidget/main.cpp (100%) rename examples/{ => multimediawidgets}/customvideosurface/customvideowidget/videoplayer.cpp (100%) rename examples/{ => multimediawidgets}/customvideosurface/customvideowidget/videoplayer.h (100%) rename examples/{ => multimediawidgets}/customvideosurface/customvideowidget/videowidget.cpp (100%) rename examples/{ => multimediawidgets}/customvideosurface/customvideowidget/videowidget.h (100%) rename examples/{ => multimediawidgets}/customvideosurface/customvideowidget/videowidgetsurface.cpp (100%) rename examples/{ => multimediawidgets}/customvideosurface/customvideowidget/videowidgetsurface.h (100%) rename examples/{ => multimediawidgets}/declarative-camera/CameraButton.qml (100%) rename examples/{ => multimediawidgets}/declarative-camera/CameraPropertyButton.qml (100%) rename examples/{ => multimediawidgets}/declarative-camera/CameraPropertyPopup.qml (100%) rename examples/{ => multimediawidgets}/declarative-camera/FocusButton.qml (100%) rename examples/{ => multimediawidgets}/declarative-camera/PhotoCaptureControls.qml (100%) rename examples/{ => multimediawidgets}/declarative-camera/PhotoPreview.qml (100%) rename examples/{ => multimediawidgets}/declarative-camera/VideoCaptureControls.qml (100%) rename examples/{ => multimediawidgets}/declarative-camera/VideoPreview.qml (100%) rename examples/{ => multimediawidgets}/declarative-camera/ZoomControl.qml (100%) create mode 100644 examples/multimediawidgets/declarative-camera/declarative-camera.pro rename examples/{ => multimediawidgets}/declarative-camera/declarative-camera.qml (100%) rename examples/{ => multimediawidgets}/declarative-camera/declarative-camera.qmlproject (100%) rename examples/{ => multimediawidgets}/declarative-camera/doc/images/qml-camera.png (100%) rename examples/{ => multimediawidgets}/declarative-camera/doc/src/declarative-camera.qdoc (100%) rename examples/{ => multimediawidgets}/declarative-camera/images/camera_auto_mode.png (100%) rename examples/{ => multimediawidgets}/declarative-camera/images/camera_camera_setting.png (100%) rename examples/{ => multimediawidgets}/declarative-camera/images/camera_flash_auto.png (100%) rename examples/{ => multimediawidgets}/declarative-camera/images/camera_flash_fill.png (100%) rename examples/{ => multimediawidgets}/declarative-camera/images/camera_flash_off.png (100%) rename examples/{ => multimediawidgets}/declarative-camera/images/camera_flash_redeye.png (100%) rename examples/{ => multimediawidgets}/declarative-camera/images/camera_white_balance_cloudy.png (100%) rename examples/{ => multimediawidgets}/declarative-camera/images/camera_white_balance_flourescent.png (100%) rename examples/{ => multimediawidgets}/declarative-camera/images/camera_white_balance_incandescent.png (100%) rename examples/{ => multimediawidgets}/declarative-camera/images/camera_white_balance_sunny.png (100%) rename examples/{ => multimediawidgets}/declarative-camera/images/toolbutton.png (100%) rename examples/{ => multimediawidgets}/declarative-camera/images/toolbutton.sci (100%) rename examples/{ => multimediawidgets}/declarative-camera/qmlcamera.cpp (100%) create mode 100644 examples/multimediawidgets/multimediawidgets.pro rename examples/{ => multimediawidgets}/player/doc/src/player.qdoc (100%) rename examples/{ => multimediawidgets}/player/histogramwidget.cpp (100%) rename examples/{ => multimediawidgets}/player/histogramwidget.h (100%) rename examples/{ => multimediawidgets}/player/main.cpp (100%) rename examples/{ => multimediawidgets}/player/player.cpp (100%) rename examples/{ => multimediawidgets}/player/player.h (100%) rename examples/{ => multimediawidgets}/player/player.pro (66%) rename examples/{ => multimediawidgets}/player/playercontrols.cpp (100%) rename examples/{ => multimediawidgets}/player/playercontrols.h (100%) rename examples/{ => multimediawidgets}/player/playlistmodel.cpp (100%) rename examples/{ => multimediawidgets}/player/playlistmodel.h (100%) rename examples/{ => multimediawidgets}/player/videowidget.cpp (100%) rename examples/{ => multimediawidgets}/player/videowidget.h (100%) rename examples/{ => multimediawidgets}/videographicsitem/doc/images/video-videographicsitem.png (100%) rename examples/{ => multimediawidgets}/videographicsitem/doc/src/videographicsitem.qdoc (100%) rename examples/{ => multimediawidgets}/videographicsitem/main.cpp (100%) create mode 100644 examples/multimediawidgets/videographicsitem/videographicsitem.pro rename examples/{ => multimediawidgets}/videographicsitem/videoplayer.cpp (100%) rename examples/{ => multimediawidgets}/videographicsitem/videoplayer.h (100%) rename examples/{ => multimediawidgets}/videowidget/doc/images/video-videowidget.png (100%) rename examples/{ => multimediawidgets}/videowidget/doc/src/videowidget.qdoc (100%) rename examples/{ => multimediawidgets}/videowidget/main.cpp (100%) rename examples/{ => multimediawidgets}/videowidget/videoplayer.cpp (100%) rename examples/{ => multimediawidgets}/videowidget/videoplayer.h (100%) create mode 100644 examples/multimediawidgets/videowidget/videowidget.pro delete mode 100644 examples/radio/radio.pro delete mode 100644 examples/video/video.pro delete mode 100644 examples/videographicsitem/videographicsitem.pro delete mode 100644 examples/videowidget/videowidget.pro diff --git a/.qmake.conf b/.qmake.conf index 42ba8e45..5de255cb 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1 +1,2 @@ load(qt_build_config) +CONFIG += qt_example_installs diff --git a/examples/audiodecoder/audiodecoder.pro b/examples/audiodecoder/audiodecoder.pro deleted file mode 100644 index 3c238daa..00000000 --- a/examples/audiodecoder/audiodecoder.pro +++ /dev/null @@ -1,20 +0,0 @@ -TEMPLATE = app -TARGET = audiodecoder - -CONFIG += qt warn_on - -HEADERS = \ - audiodecoder.h \ - wavefilewriter.h -SOURCES = main.cpp \ - audiodecoder.cpp \ - wavefilewriter.cpp - -QT += multimedia -CONFIG += console - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiodecoder -sources.files = $$SOURCES $$HEADERS audiodecoder.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiodecoder -INSTALLS += target sources diff --git a/examples/audiodevices/audiodevices.pro b/examples/audiodevices/audiodevices.pro deleted file mode 100644 index 7bd59876..00000000 --- a/examples/audiodevices/audiodevices.pro +++ /dev/null @@ -1,19 +0,0 @@ -TEMPLATE = app -TARGET = audiodevices - -QT += multimedia - -HEADERS = audiodevices.h - -SOURCES = audiodevices.cpp \ - main.cpp - -FORMS += audiodevicesbase.ui - -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiodevices -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiodevices - -INSTALLS += target sources - -QT+=widgets diff --git a/examples/audioengine/audioengine.pro b/examples/audioengine/audioengine.pro deleted file mode 100644 index e5e5c8df..00000000 --- a/examples/audioengine/audioengine.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = subdirs - -# These examples contain no C++ and can simply be copied -SUBDIRS = -sources.files = doc qml -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audioengine -INSTALLS += sources - -OTHER_FILES += qml/*.qml qml/*.qmlproject qml/content/* - diff --git a/examples/audioinput/audioinput.pro b/examples/audioinput/audioinput.pro deleted file mode 100644 index d2ee4bd9..00000000 --- a/examples/audioinput/audioinput.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app -TARGET = audioinput - -QT += multimedia widgets - -HEADERS = audioinput.h - -SOURCES = audioinput.cpp \ - main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audioinput -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audioinput - -INSTALLS += target sources diff --git a/examples/audiooutput/audiooutput.pro b/examples/audiooutput/audiooutput.pro deleted file mode 100644 index 70aad897..00000000 --- a/examples/audiooutput/audiooutput.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app -TARGET = audiooutput - -QT += multimedia widgets - -HEADERS = audiooutput.h - -SOURCES = audiooutput.cpp \ - main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiooutput -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiooutput - -INSTALLS += target sources diff --git a/examples/customvideosurface/customvideosurface.pro b/examples/customvideosurface/customvideosurface.pro deleted file mode 100644 index 2e0e798e..00000000 --- a/examples/customvideosurface/customvideosurface.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += customvideoitem customvideowidget - -# install -sources.files = customvideosurface.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideosurface -INSTALLS += sources diff --git a/examples/customvideosurface/customvideowidget/customvideowidget.pro b/examples/customvideosurface/customvideowidget/customvideowidget.pro deleted file mode 100644 index 6f4d005c..00000000 --- a/examples/customvideosurface/customvideowidget/customvideowidget.pro +++ /dev/null @@ -1,21 +0,0 @@ -TEMPLATE = app -TARGET = customvideowidget - -QT += multimedia multimediawidgets widgets - -HEADERS = \ - videoplayer.h \ - videowidget.h \ - videowidgetsurface.h - -SOURCES = \ - main.cpp \ - videoplayer.cpp \ - videowidget.cpp \ - videowidgetsurface.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideosurface/customvideowidget -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideosurface/customvideowidget - -INSTALLS += target sources diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro deleted file mode 100644 index 54d6f392..00000000 --- a/examples/declarative-camera/declarative-camera.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE=app -TARGET=declarative-camera - -QT += quick qml multimedia - -SOURCES += qmlcamera.cpp - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/declarative-camera -sources.files = $$SOURCES *.pro images *.qml -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/declarative-camera -INSTALLS += target sources - diff --git a/examples/declarative-radio/declarative-radio.pro b/examples/declarative-radio/declarative-radio.pro deleted file mode 100644 index e536393d..00000000 --- a/examples/declarative-radio/declarative-radio.pro +++ /dev/null @@ -1,12 +0,0 @@ -QT += qml quick multimedia - -SOURCES += main.cpp -RESOURCES += declarative-radio.qrc - -OTHER_FILES += view.qml - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/declarative-radio -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro doc view.qml -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/declarative-radio -INSTALLS += target sources diff --git a/examples/examples.pro b/examples/examples.pro index cf9dae1b..97967167 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,31 +1,3 @@ TEMPLATE = subdirs - -SUBDIRS += audiodecoder - -# These examples all need widgets for now (using creator templates that use widgets) -!isEmpty(QT.widgets.name) { - SUBDIRS += \ - radio \ - camera \ - spectrum \ - audiorecorder \ - audiodevices \ - audioinput \ - audiooutput \ - videographicsitem \ - videowidget \ - player \ - customvideosurface - - QT += widgets -} - -!isEmpty(QT.gui.name):!isEmpty(QT.qml.name) { - disabled:SUBDIRS += declarative-camera - SUBDIRS += \ - declarative-radio \ - video -} - -config_openal: SUBDIRS += audioengine +SUBDIRS += multimedia multimediawidgets diff --git a/examples/audiodecoder/audiodecoder.cpp b/examples/multimedia/audiodecoder/audiodecoder.cpp similarity index 100% rename from examples/audiodecoder/audiodecoder.cpp rename to examples/multimedia/audiodecoder/audiodecoder.cpp diff --git a/examples/audiodecoder/audiodecoder.h b/examples/multimedia/audiodecoder/audiodecoder.h similarity index 100% rename from examples/audiodecoder/audiodecoder.h rename to examples/multimedia/audiodecoder/audiodecoder.h diff --git a/examples/multimedia/audiodecoder/audiodecoder.pro b/examples/multimedia/audiodecoder/audiodecoder.pro new file mode 100644 index 00000000..0a09c3cf --- /dev/null +++ b/examples/multimedia/audiodecoder/audiodecoder.pro @@ -0,0 +1,17 @@ +TEMPLATE = app +TARGET = audiodecoder + +CONFIG += qt warn_on + +HEADERS = \ + audiodecoder.h \ + wavefilewriter.h +SOURCES = main.cpp \ + audiodecoder.cpp \ + wavefilewriter.cpp + +QT += multimedia +CONFIG += console + +target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiodecoder +INSTALLS += target diff --git a/examples/audiodecoder/main.cpp b/examples/multimedia/audiodecoder/main.cpp similarity index 100% rename from examples/audiodecoder/main.cpp rename to examples/multimedia/audiodecoder/main.cpp diff --git a/examples/audiodecoder/wavefilewriter.cpp b/examples/multimedia/audiodecoder/wavefilewriter.cpp similarity index 100% rename from examples/audiodecoder/wavefilewriter.cpp rename to examples/multimedia/audiodecoder/wavefilewriter.cpp diff --git a/examples/audiodecoder/wavefilewriter.h b/examples/multimedia/audiodecoder/wavefilewriter.h similarity index 100% rename from examples/audiodecoder/wavefilewriter.h rename to examples/multimedia/audiodecoder/wavefilewriter.h diff --git a/examples/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp similarity index 100% rename from examples/audiodevices/audiodevices.cpp rename to examples/multimedia/audiodevices/audiodevices.cpp diff --git a/examples/audiodevices/audiodevices.h b/examples/multimedia/audiodevices/audiodevices.h similarity index 100% rename from examples/audiodevices/audiodevices.h rename to examples/multimedia/audiodevices/audiodevices.h diff --git a/examples/multimedia/audiodevices/audiodevices.pro b/examples/multimedia/audiodevices/audiodevices.pro new file mode 100644 index 00000000..71701543 --- /dev/null +++ b/examples/multimedia/audiodevices/audiodevices.pro @@ -0,0 +1,16 @@ +TEMPLATE = app +TARGET = audiodevices + +QT += multimedia + +HEADERS = audiodevices.h + +SOURCES = audiodevices.cpp \ + main.cpp + +FORMS += audiodevicesbase.ui + +target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiodevices +INSTALLS += target + +QT+=widgets diff --git a/examples/audiodevices/audiodevicesbase.ui b/examples/multimedia/audiodevices/audiodevicesbase.ui similarity index 100% rename from examples/audiodevices/audiodevicesbase.ui rename to examples/multimedia/audiodevices/audiodevicesbase.ui diff --git a/examples/audiodevices/doc/images/audiodevices.png b/examples/multimedia/audiodevices/doc/images/audiodevices.png similarity index 100% rename from examples/audiodevices/doc/images/audiodevices.png rename to examples/multimedia/audiodevices/doc/images/audiodevices.png diff --git a/examples/audiodevices/doc/src/audiodevices.qdoc b/examples/multimedia/audiodevices/doc/src/audiodevices.qdoc similarity index 100% rename from examples/audiodevices/doc/src/audiodevices.qdoc rename to examples/multimedia/audiodevices/doc/src/audiodevices.qdoc diff --git a/examples/audiodevices/main.cpp b/examples/multimedia/audiodevices/main.cpp similarity index 100% rename from examples/audiodevices/main.cpp rename to examples/multimedia/audiodevices/main.cpp diff --git a/examples/multimedia/audioengine/audioengine.pro b/examples/multimedia/audioengine/audioengine.pro new file mode 100644 index 00000000..84bc492b --- /dev/null +++ b/examples/multimedia/audioengine/audioengine.pro @@ -0,0 +1,6 @@ +TEMPLATE = subdirs + +# These examples contain no C++ and can simply be copied +SUBDIRS = +EXAMPLE_FILES = qml + diff --git a/examples/audioengine/doc/src/audioengine.qdoc b/examples/multimedia/audioengine/doc/src/audioengine.qdoc similarity index 100% rename from examples/audioengine/doc/src/audioengine.qdoc rename to examples/multimedia/audioengine/doc/src/audioengine.qdoc diff --git a/examples/audioengine/qml/audioengine.qml b/examples/multimedia/audioengine/qml/audioengine.qml similarity index 100% rename from examples/audioengine/qml/audioengine.qml rename to examples/multimedia/audioengine/qml/audioengine.qml diff --git a/examples/audioengine/qml/audioengine.qmlproject b/examples/multimedia/audioengine/qml/audioengine.qmlproject similarity index 100% rename from examples/audioengine/qml/audioengine.qmlproject rename to examples/multimedia/audioengine/qml/audioengine.qmlproject diff --git a/examples/audioengine/qml/content/MyAudioEngine.qml b/examples/multimedia/audioengine/qml/content/MyAudioEngine.qml similarity index 100% rename from examples/audioengine/qml/content/MyAudioEngine.qml rename to examples/multimedia/audioengine/qml/content/MyAudioEngine.qml diff --git a/examples/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp similarity index 100% rename from examples/audioinput/audioinput.cpp rename to examples/multimedia/audioinput/audioinput.cpp diff --git a/examples/audioinput/audioinput.h b/examples/multimedia/audioinput/audioinput.h similarity index 100% rename from examples/audioinput/audioinput.h rename to examples/multimedia/audioinput/audioinput.h diff --git a/examples/multimedia/audioinput/audioinput.pro b/examples/multimedia/audioinput/audioinput.pro new file mode 100644 index 00000000..b0dc57c2 --- /dev/null +++ b/examples/multimedia/audioinput/audioinput.pro @@ -0,0 +1,12 @@ +TEMPLATE = app +TARGET = audioinput + +QT += multimedia widgets + +HEADERS = audioinput.h + +SOURCES = audioinput.cpp \ + main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audioinput +INSTALLS += target diff --git a/examples/audioinput/doc/images/audioinput-example.png b/examples/multimedia/audioinput/doc/images/audioinput-example.png similarity index 100% rename from examples/audioinput/doc/images/audioinput-example.png rename to examples/multimedia/audioinput/doc/images/audioinput-example.png diff --git a/examples/audioinput/doc/src/audioinput.qdoc b/examples/multimedia/audioinput/doc/src/audioinput.qdoc similarity index 100% rename from examples/audioinput/doc/src/audioinput.qdoc rename to examples/multimedia/audioinput/doc/src/audioinput.qdoc diff --git a/examples/audioinput/main.cpp b/examples/multimedia/audioinput/main.cpp similarity index 100% rename from examples/audioinput/main.cpp rename to examples/multimedia/audioinput/main.cpp diff --git a/examples/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp similarity index 100% rename from examples/audiooutput/audiooutput.cpp rename to examples/multimedia/audiooutput/audiooutput.cpp diff --git a/examples/audiooutput/audiooutput.h b/examples/multimedia/audiooutput/audiooutput.h similarity index 100% rename from examples/audiooutput/audiooutput.h rename to examples/multimedia/audiooutput/audiooutput.h diff --git a/examples/multimedia/audiooutput/audiooutput.pro b/examples/multimedia/audiooutput/audiooutput.pro new file mode 100644 index 00000000..c843f010 --- /dev/null +++ b/examples/multimedia/audiooutput/audiooutput.pro @@ -0,0 +1,12 @@ +TEMPLATE = app +TARGET = audiooutput + +QT += multimedia widgets + +HEADERS = audiooutput.h + +SOURCES = audiooutput.cpp \ + main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiooutput +INSTALLS += target diff --git a/examples/audiooutput/doc/images/audiooutput-example.png b/examples/multimedia/audiooutput/doc/images/audiooutput-example.png similarity index 100% rename from examples/audiooutput/doc/images/audiooutput-example.png rename to examples/multimedia/audiooutput/doc/images/audiooutput-example.png diff --git a/examples/audiooutput/doc/src/audiooutput.qdoc b/examples/multimedia/audiooutput/doc/src/audiooutput.qdoc similarity index 100% rename from examples/audiooutput/doc/src/audiooutput.qdoc rename to examples/multimedia/audiooutput/doc/src/audiooutput.qdoc diff --git a/examples/audiooutput/main.cpp b/examples/multimedia/audiooutput/main.cpp similarity index 100% rename from examples/audiooutput/main.cpp rename to examples/multimedia/audiooutput/main.cpp diff --git a/examples/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp similarity index 100% rename from examples/audiorecorder/audiorecorder.cpp rename to examples/multimedia/audiorecorder/audiorecorder.cpp diff --git a/examples/audiorecorder/audiorecorder.h b/examples/multimedia/audiorecorder/audiorecorder.h similarity index 100% rename from examples/audiorecorder/audiorecorder.h rename to examples/multimedia/audiorecorder/audiorecorder.h diff --git a/examples/audiorecorder/audiorecorder.pro b/examples/multimedia/audiorecorder/audiorecorder.pro similarity index 58% rename from examples/audiorecorder/audiorecorder.pro rename to examples/multimedia/audiorecorder/audiorecorder.pro index 7936d951..6fdc4b13 100644 --- a/examples/audiorecorder/audiorecorder.pro +++ b/examples/multimedia/audiorecorder/audiorecorder.pro @@ -20,10 +20,7 @@ maemo*: { FORMS += audiorecorder.ui } -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiorecorder -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiorecorder - -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiorecorder +INSTALLS += target QT+=widgets diff --git a/examples/audiorecorder/audiorecorder.ui b/examples/multimedia/audiorecorder/audiorecorder.ui similarity index 100% rename from examples/audiorecorder/audiorecorder.ui rename to examples/multimedia/audiorecorder/audiorecorder.ui diff --git a/examples/audiorecorder/audiorecorder_small.ui b/examples/multimedia/audiorecorder/audiorecorder_small.ui similarity index 100% rename from examples/audiorecorder/audiorecorder_small.ui rename to examples/multimedia/audiorecorder/audiorecorder_small.ui diff --git a/examples/audiorecorder/doc/images/audiorecorder.png b/examples/multimedia/audiorecorder/doc/images/audiorecorder.png similarity index 100% rename from examples/audiorecorder/doc/images/audiorecorder.png rename to examples/multimedia/audiorecorder/doc/images/audiorecorder.png diff --git a/examples/audiorecorder/doc/src/audiorecorder.qdoc b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc similarity index 100% rename from examples/audiorecorder/doc/src/audiorecorder.qdoc rename to examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc diff --git a/examples/audiorecorder/main.cpp b/examples/multimedia/audiorecorder/main.cpp similarity index 100% rename from examples/audiorecorder/main.cpp rename to examples/multimedia/audiorecorder/main.cpp diff --git a/examples/audiorecorder/qaudiolevel.cpp b/examples/multimedia/audiorecorder/qaudiolevel.cpp similarity index 100% rename from examples/audiorecorder/qaudiolevel.cpp rename to examples/multimedia/audiorecorder/qaudiolevel.cpp diff --git a/examples/audiorecorder/qaudiolevel.h b/examples/multimedia/audiorecorder/qaudiolevel.h similarity index 100% rename from examples/audiorecorder/qaudiolevel.h rename to examples/multimedia/audiorecorder/qaudiolevel.h diff --git a/examples/multimedia/declarative-radio/declarative-radio.pro b/examples/multimedia/declarative-radio/declarative-radio.pro new file mode 100644 index 00000000..68942fa3 --- /dev/null +++ b/examples/multimedia/declarative-radio/declarative-radio.pro @@ -0,0 +1,9 @@ +QT += qml quick multimedia + +SOURCES += main.cpp +RESOURCES += declarative-radio.qrc + +EXAMPLE_FILES += view.qml + +target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/declarative-radio +INSTALLS += target diff --git a/examples/declarative-radio/declarative-radio.qrc b/examples/multimedia/declarative-radio/declarative-radio.qrc similarity index 100% rename from examples/declarative-radio/declarative-radio.qrc rename to examples/multimedia/declarative-radio/declarative-radio.qrc diff --git a/examples/declarative-radio/doc/images/declarative-radio-example.png b/examples/multimedia/declarative-radio/doc/images/declarative-radio-example.png similarity index 100% rename from examples/declarative-radio/doc/images/declarative-radio-example.png rename to examples/multimedia/declarative-radio/doc/images/declarative-radio-example.png diff --git a/examples/declarative-radio/doc/src/declarative-radio.qdoc b/examples/multimedia/declarative-radio/doc/src/declarative-radio.qdoc similarity index 100% rename from examples/declarative-radio/doc/src/declarative-radio.qdoc rename to examples/multimedia/declarative-radio/doc/src/declarative-radio.qdoc diff --git a/examples/declarative-radio/main.cpp b/examples/multimedia/declarative-radio/main.cpp similarity index 100% rename from examples/declarative-radio/main.cpp rename to examples/multimedia/declarative-radio/main.cpp diff --git a/examples/declarative-radio/view.qml b/examples/multimedia/declarative-radio/view.qml similarity index 100% rename from examples/declarative-radio/view.qml rename to examples/multimedia/declarative-radio/view.qml diff --git a/examples/multimedia/multimedia.pro b/examples/multimedia/multimedia.pro new file mode 100644 index 00000000..020ddaa9 --- /dev/null +++ b/examples/multimedia/multimedia.pro @@ -0,0 +1,25 @@ +TEMPLATE = subdirs + +SUBDIRS += audiodecoder + +# These examples all need widgets for now (using creator templates that use widgets) +!isEmpty(QT.widgets.name) { + SUBDIRS += \ + radio \ + spectrum \ + audiorecorder \ + audiodevices \ + audioinput \ + audiooutput \ + + QT += widgets +} + +!isEmpty(QT.gui.name):!isEmpty(QT.qml.name) { + SUBDIRS += \ + declarative-radio \ + video +} + +config_openal: SUBDIRS += audioengine + diff --git a/examples/radio/main.cpp b/examples/multimedia/radio/main.cpp similarity index 100% rename from examples/radio/main.cpp rename to examples/multimedia/radio/main.cpp diff --git a/examples/radio/radio.cpp b/examples/multimedia/radio/radio.cpp similarity index 100% rename from examples/radio/radio.cpp rename to examples/multimedia/radio/radio.cpp diff --git a/examples/radio/radio.h b/examples/multimedia/radio/radio.h similarity index 100% rename from examples/radio/radio.h rename to examples/multimedia/radio/radio.h diff --git a/examples/multimedia/radio/radio.pro b/examples/multimedia/radio/radio.pro new file mode 100644 index 00000000..1b1a35b3 --- /dev/null +++ b/examples/multimedia/radio/radio.pro @@ -0,0 +1,16 @@ +TEMPLATE = app +TARGET = radio + +QT += multimedia + +HEADERS = \ + radio.h + +SOURCES = \ + main.cpp \ + radio.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/radio +INSTALLS += target + +QT+=widgets diff --git a/examples/spectrum/3rdparty/fftreal/Array.h b/examples/multimedia/spectrum/3rdparty/fftreal/Array.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/Array.h rename to examples/multimedia/spectrum/3rdparty/fftreal/Array.h diff --git a/examples/spectrum/3rdparty/fftreal/Array.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/Array.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/Array.hpp rename to examples/multimedia/spectrum/3rdparty/fftreal/Array.hpp diff --git a/examples/spectrum/3rdparty/fftreal/DynArray.h b/examples/multimedia/spectrum/3rdparty/fftreal/DynArray.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/DynArray.h rename to examples/multimedia/spectrum/3rdparty/fftreal/DynArray.h diff --git a/examples/spectrum/3rdparty/fftreal/DynArray.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/DynArray.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/DynArray.hpp rename to examples/multimedia/spectrum/3rdparty/fftreal/DynArray.hpp diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.dsp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.dsp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTReal.dsp rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.dsp diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.dsw b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.dsw similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTReal.dsw rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.dsw diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTReal.h rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTReal.hpp rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.hpp diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealFixLen.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLen.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealFixLen.h rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLen.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassDirect.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.h rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassDirect.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassInverse.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.h rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassInverse.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealSelect.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealSelect.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealSelect.h rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealSelect.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealSelect.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealSelect.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealSelect.hpp rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealSelect.hpp diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp diff --git a/examples/spectrum/3rdparty/fftreal/OscSinCos.h b/examples/multimedia/spectrum/3rdparty/fftreal/OscSinCos.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/OscSinCos.h rename to examples/multimedia/spectrum/3rdparty/fftreal/OscSinCos.h diff --git a/examples/spectrum/3rdparty/fftreal/OscSinCos.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/OscSinCos.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/OscSinCos.hpp rename to examples/multimedia/spectrum/3rdparty/fftreal/OscSinCos.hpp diff --git a/examples/spectrum/3rdparty/fftreal/TestAccuracy.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestAccuracy.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestAccuracy.h rename to examples/multimedia/spectrum/3rdparty/fftreal/TestAccuracy.h diff --git a/examples/spectrum/3rdparty/fftreal/TestAccuracy.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestAccuracy.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestAccuracy.hpp rename to examples/multimedia/spectrum/3rdparty/fftreal/TestAccuracy.hpp diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperFixLen.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperFixLen.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestHelperFixLen.h rename to examples/multimedia/spectrum/3rdparty/fftreal/TestHelperFixLen.h diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp rename to examples/multimedia/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperNormal.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperNormal.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestHelperNormal.h rename to examples/multimedia/spectrum/3rdparty/fftreal/TestHelperNormal.h diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperNormal.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperNormal.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestHelperNormal.hpp rename to examples/multimedia/spectrum/3rdparty/fftreal/TestHelperNormal.hpp diff --git a/examples/spectrum/3rdparty/fftreal/TestSpeed.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestSpeed.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestSpeed.h rename to examples/multimedia/spectrum/3rdparty/fftreal/TestSpeed.h diff --git a/examples/spectrum/3rdparty/fftreal/TestSpeed.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestSpeed.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestSpeed.hpp rename to examples/multimedia/spectrum/3rdparty/fftreal/TestSpeed.hpp diff --git a/examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h rename to examples/multimedia/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h diff --git a/examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp rename to examples/multimedia/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp diff --git a/examples/spectrum/3rdparty/fftreal/bwins/fftrealu.def b/examples/multimedia/spectrum/3rdparty/fftreal/bwins/fftrealu.def similarity index 100% rename from examples/spectrum/3rdparty/fftreal/bwins/fftrealu.def rename to examples/multimedia/spectrum/3rdparty/fftreal/bwins/fftrealu.def diff --git a/examples/spectrum/3rdparty/fftreal/def.h b/examples/multimedia/spectrum/3rdparty/fftreal/def.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/def.h rename to examples/multimedia/spectrum/3rdparty/fftreal/def.h diff --git a/examples/spectrum/3rdparty/fftreal/eabi/fftrealu.def b/examples/multimedia/spectrum/3rdparty/fftreal/eabi/fftrealu.def similarity index 100% rename from examples/spectrum/3rdparty/fftreal/eabi/fftrealu.def rename to examples/multimedia/spectrum/3rdparty/fftreal/eabi/fftrealu.def diff --git a/examples/spectrum/3rdparty/fftreal/fftreal.pas b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pas similarity index 100% rename from examples/spectrum/3rdparty/fftreal/fftreal.pas rename to examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pas diff --git a/examples/spectrum/3rdparty/fftreal/fftreal.pro b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro similarity index 75% rename from examples/spectrum/3rdparty/fftreal/fftreal.pro rename to examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro index 45a21864..f6abeeb1 100644 --- a/examples/spectrum/3rdparty/fftreal/fftreal.pro +++ b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro @@ -37,11 +37,8 @@ macx { DESTDIR = ../..$${spectrum_build_dir} } -# Install +EXAMPLE_FILES = bwins/fftreal.def eabi/fftreal.def readme.txt license.txt -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum -sources.files = $$SOURCES $$HEADERS fftreal.pro readme.txt license.txt -sources.files += bwins/fftreal.def eabi/fftreal.def -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum/3rdparty/fftreal -INSTALLS += sources target +target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/spectrum +INSTALLS += target diff --git a/examples/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp rename to examples/multimedia/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp diff --git a/examples/spectrum/3rdparty/fftreal/fftreal_wrapper.h b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal_wrapper.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/fftreal_wrapper.h rename to examples/multimedia/spectrum/3rdparty/fftreal/fftreal_wrapper.h diff --git a/examples/spectrum/3rdparty/fftreal/license.txt b/examples/multimedia/spectrum/3rdparty/fftreal/license.txt similarity index 100% rename from examples/spectrum/3rdparty/fftreal/license.txt rename to examples/multimedia/spectrum/3rdparty/fftreal/license.txt diff --git a/examples/spectrum/3rdparty/fftreal/readme.txt b/examples/multimedia/spectrum/3rdparty/fftreal/readme.txt similarity index 100% rename from examples/spectrum/3rdparty/fftreal/readme.txt rename to examples/multimedia/spectrum/3rdparty/fftreal/readme.txt diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/Int64.h b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/Int64.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/stopwatch/Int64.h rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/Int64.h diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/def.h b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/def.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/stopwatch/def.h rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/def.h diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/fnc.h b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/fnc.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/stopwatch/fnc.h rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/fnc.h diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp rename to examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp diff --git a/examples/spectrum/3rdparty/fftreal/test.cpp b/examples/multimedia/spectrum/3rdparty/fftreal/test.cpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/test.cpp rename to examples/multimedia/spectrum/3rdparty/fftreal/test.cpp diff --git a/examples/spectrum/3rdparty/fftreal/test_fnc.h b/examples/multimedia/spectrum/3rdparty/fftreal/test_fnc.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/test_fnc.h rename to examples/multimedia/spectrum/3rdparty/fftreal/test_fnc.h diff --git a/examples/spectrum/3rdparty/fftreal/test_fnc.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/test_fnc.hpp similarity index 100% rename from examples/spectrum/3rdparty/fftreal/test_fnc.hpp rename to examples/multimedia/spectrum/3rdparty/fftreal/test_fnc.hpp diff --git a/examples/spectrum/3rdparty/fftreal/test_settings.h b/examples/multimedia/spectrum/3rdparty/fftreal/test_settings.h similarity index 100% rename from examples/spectrum/3rdparty/fftreal/test_settings.h rename to examples/multimedia/spectrum/3rdparty/fftreal/test_settings.h diff --git a/examples/spectrum/3rdparty/fftreal/testapp.dpr b/examples/multimedia/spectrum/3rdparty/fftreal/testapp.dpr similarity index 100% rename from examples/spectrum/3rdparty/fftreal/testapp.dpr rename to examples/multimedia/spectrum/3rdparty/fftreal/testapp.dpr diff --git a/examples/spectrum/README.txt b/examples/multimedia/spectrum/README.txt similarity index 100% rename from examples/spectrum/README.txt rename to examples/multimedia/spectrum/README.txt diff --git a/examples/spectrum/TODO.txt b/examples/multimedia/spectrum/TODO.txt similarity index 100% rename from examples/spectrum/TODO.txt rename to examples/multimedia/spectrum/TODO.txt diff --git a/examples/spectrum/app/.gitignore b/examples/multimedia/spectrum/app/.gitignore similarity index 100% rename from examples/spectrum/app/.gitignore rename to examples/multimedia/spectrum/app/.gitignore diff --git a/examples/spectrum/app/app.pro b/examples/multimedia/spectrum/app/app.pro similarity index 87% rename from examples/spectrum/app/app.pro rename to examples/multimedia/spectrum/app/app.pro index 712fafcf..581848a7 100644 --- a/examples/spectrum/app/app.pro +++ b/examples/multimedia/spectrum/app/app.pro @@ -56,14 +56,8 @@ RESOURCES = spectrum.qrc } } -# Install - -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum -sources.files = $$SOURCES $$HEADERS $$RESOURCES app.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum/app -images.files += images/record.png images/settings.png -images.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum/app/images -INSTALLS += target sources images +target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/spectrum +INSTALLS += target # Deployment diff --git a/examples/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp similarity index 100% rename from examples/spectrum/app/engine.cpp rename to examples/multimedia/spectrum/app/engine.cpp diff --git a/examples/spectrum/app/engine.h b/examples/multimedia/spectrum/app/engine.h similarity index 100% rename from examples/spectrum/app/engine.h rename to examples/multimedia/spectrum/app/engine.h diff --git a/examples/spectrum/app/frequencyspectrum.cpp b/examples/multimedia/spectrum/app/frequencyspectrum.cpp similarity index 100% rename from examples/spectrum/app/frequencyspectrum.cpp rename to examples/multimedia/spectrum/app/frequencyspectrum.cpp diff --git a/examples/spectrum/app/frequencyspectrum.h b/examples/multimedia/spectrum/app/frequencyspectrum.h similarity index 100% rename from examples/spectrum/app/frequencyspectrum.h rename to examples/multimedia/spectrum/app/frequencyspectrum.h diff --git a/examples/spectrum/app/images/record.png b/examples/multimedia/spectrum/app/images/record.png similarity index 100% rename from examples/spectrum/app/images/record.png rename to examples/multimedia/spectrum/app/images/record.png diff --git a/examples/spectrum/app/images/settings.png b/examples/multimedia/spectrum/app/images/settings.png similarity index 100% rename from examples/spectrum/app/images/settings.png rename to examples/multimedia/spectrum/app/images/settings.png diff --git a/examples/spectrum/app/levelmeter.cpp b/examples/multimedia/spectrum/app/levelmeter.cpp similarity index 100% rename from examples/spectrum/app/levelmeter.cpp rename to examples/multimedia/spectrum/app/levelmeter.cpp diff --git a/examples/spectrum/app/levelmeter.h b/examples/multimedia/spectrum/app/levelmeter.h similarity index 100% rename from examples/spectrum/app/levelmeter.h rename to examples/multimedia/spectrum/app/levelmeter.h diff --git a/examples/spectrum/app/main.cpp b/examples/multimedia/spectrum/app/main.cpp similarity index 100% rename from examples/spectrum/app/main.cpp rename to examples/multimedia/spectrum/app/main.cpp diff --git a/examples/spectrum/app/mainwidget.cpp b/examples/multimedia/spectrum/app/mainwidget.cpp similarity index 100% rename from examples/spectrum/app/mainwidget.cpp rename to examples/multimedia/spectrum/app/mainwidget.cpp diff --git a/examples/spectrum/app/mainwidget.h b/examples/multimedia/spectrum/app/mainwidget.h similarity index 100% rename from examples/spectrum/app/mainwidget.h rename to examples/multimedia/spectrum/app/mainwidget.h diff --git a/examples/spectrum/app/progressbar.cpp b/examples/multimedia/spectrum/app/progressbar.cpp similarity index 100% rename from examples/spectrum/app/progressbar.cpp rename to examples/multimedia/spectrum/app/progressbar.cpp diff --git a/examples/spectrum/app/progressbar.h b/examples/multimedia/spectrum/app/progressbar.h similarity index 100% rename from examples/spectrum/app/progressbar.h rename to examples/multimedia/spectrum/app/progressbar.h diff --git a/examples/spectrum/app/settingsdialog.cpp b/examples/multimedia/spectrum/app/settingsdialog.cpp similarity index 100% rename from examples/spectrum/app/settingsdialog.cpp rename to examples/multimedia/spectrum/app/settingsdialog.cpp diff --git a/examples/spectrum/app/settingsdialog.h b/examples/multimedia/spectrum/app/settingsdialog.h similarity index 100% rename from examples/spectrum/app/settingsdialog.h rename to examples/multimedia/spectrum/app/settingsdialog.h diff --git a/examples/spectrum/app/spectrograph.cpp b/examples/multimedia/spectrum/app/spectrograph.cpp similarity index 100% rename from examples/spectrum/app/spectrograph.cpp rename to examples/multimedia/spectrum/app/spectrograph.cpp diff --git a/examples/spectrum/app/spectrograph.h b/examples/multimedia/spectrum/app/spectrograph.h similarity index 100% rename from examples/spectrum/app/spectrograph.h rename to examples/multimedia/spectrum/app/spectrograph.h diff --git a/examples/spectrum/app/spectrum.h b/examples/multimedia/spectrum/app/spectrum.h similarity index 100% rename from examples/spectrum/app/spectrum.h rename to examples/multimedia/spectrum/app/spectrum.h diff --git a/examples/spectrum/app/spectrum.qrc b/examples/multimedia/spectrum/app/spectrum.qrc similarity index 100% rename from examples/spectrum/app/spectrum.qrc rename to examples/multimedia/spectrum/app/spectrum.qrc diff --git a/examples/spectrum/app/spectrumanalyser.cpp b/examples/multimedia/spectrum/app/spectrumanalyser.cpp similarity index 100% rename from examples/spectrum/app/spectrumanalyser.cpp rename to examples/multimedia/spectrum/app/spectrumanalyser.cpp diff --git a/examples/spectrum/app/spectrumanalyser.h b/examples/multimedia/spectrum/app/spectrumanalyser.h similarity index 100% rename from examples/spectrum/app/spectrumanalyser.h rename to examples/multimedia/spectrum/app/spectrumanalyser.h diff --git a/examples/spectrum/app/tonegenerator.cpp b/examples/multimedia/spectrum/app/tonegenerator.cpp similarity index 100% rename from examples/spectrum/app/tonegenerator.cpp rename to examples/multimedia/spectrum/app/tonegenerator.cpp diff --git a/examples/spectrum/app/tonegenerator.h b/examples/multimedia/spectrum/app/tonegenerator.h similarity index 100% rename from examples/spectrum/app/tonegenerator.h rename to examples/multimedia/spectrum/app/tonegenerator.h diff --git a/examples/spectrum/app/tonegeneratordialog.cpp b/examples/multimedia/spectrum/app/tonegeneratordialog.cpp similarity index 100% rename from examples/spectrum/app/tonegeneratordialog.cpp rename to examples/multimedia/spectrum/app/tonegeneratordialog.cpp diff --git a/examples/spectrum/app/tonegeneratordialog.h b/examples/multimedia/spectrum/app/tonegeneratordialog.h similarity index 100% rename from examples/spectrum/app/tonegeneratordialog.h rename to examples/multimedia/spectrum/app/tonegeneratordialog.h diff --git a/examples/spectrum/app/utils.cpp b/examples/multimedia/spectrum/app/utils.cpp similarity index 100% rename from examples/spectrum/app/utils.cpp rename to examples/multimedia/spectrum/app/utils.cpp diff --git a/examples/spectrum/app/utils.h b/examples/multimedia/spectrum/app/utils.h similarity index 100% rename from examples/spectrum/app/utils.h rename to examples/multimedia/spectrum/app/utils.h diff --git a/examples/spectrum/app/waveform.cpp b/examples/multimedia/spectrum/app/waveform.cpp similarity index 100% rename from examples/spectrum/app/waveform.cpp rename to examples/multimedia/spectrum/app/waveform.cpp diff --git a/examples/spectrum/app/waveform.h b/examples/multimedia/spectrum/app/waveform.h similarity index 100% rename from examples/spectrum/app/waveform.h rename to examples/multimedia/spectrum/app/waveform.h diff --git a/examples/spectrum/app/wavfile.cpp b/examples/multimedia/spectrum/app/wavfile.cpp similarity index 100% rename from examples/spectrum/app/wavfile.cpp rename to examples/multimedia/spectrum/app/wavfile.cpp diff --git a/examples/spectrum/app/wavfile.h b/examples/multimedia/spectrum/app/wavfile.h similarity index 100% rename from examples/spectrum/app/wavfile.h rename to examples/multimedia/spectrum/app/wavfile.h diff --git a/examples/spectrum/doc/images/spectrum-demo.png b/examples/multimedia/spectrum/doc/images/spectrum-demo.png similarity index 100% rename from examples/spectrum/doc/images/spectrum-demo.png rename to examples/multimedia/spectrum/doc/images/spectrum-demo.png diff --git a/examples/spectrum/doc/src/spectrum.qdoc b/examples/multimedia/spectrum/doc/src/spectrum.qdoc similarity index 100% rename from examples/spectrum/doc/src/spectrum.qdoc rename to examples/multimedia/spectrum/doc/src/spectrum.qdoc diff --git a/examples/spectrum/spectrum.pri b/examples/multimedia/spectrum/spectrum.pri similarity index 100% rename from examples/spectrum/spectrum.pri rename to examples/multimedia/spectrum/spectrum.pri diff --git a/examples/spectrum/spectrum.pro b/examples/multimedia/spectrum/spectrum.pro similarity index 60% rename from examples/spectrum/spectrum.pro rename to examples/multimedia/spectrum/spectrum.pro index 0dbb7710..164ab69b 100644 --- a/examples/spectrum/spectrum.pro +++ b/examples/multimedia/spectrum/spectrum.pro @@ -11,6 +11,3 @@ SUBDIRS += app TARGET = spectrum -sources.files = README.txt spectrum.pri spectrum.pro TODO.txt -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum -INSTALLS += sources diff --git a/examples/video/doc/images/qmlvideo-menu.png b/examples/multimedia/video/doc/images/qmlvideo-menu.png similarity index 100% rename from examples/video/doc/images/qmlvideo-menu.png rename to examples/multimedia/video/doc/images/qmlvideo-menu.png diff --git a/examples/video/doc/images/qmlvideo-overlay.png b/examples/multimedia/video/doc/images/qmlvideo-overlay.png similarity index 100% rename from examples/video/doc/images/qmlvideo-overlay.png rename to examples/multimedia/video/doc/images/qmlvideo-overlay.png diff --git a/examples/video/doc/images/qmlvideofx-camera-glow.png b/examples/multimedia/video/doc/images/qmlvideofx-camera-glow.png similarity index 100% rename from examples/video/doc/images/qmlvideofx-camera-glow.png rename to examples/multimedia/video/doc/images/qmlvideofx-camera-glow.png diff --git a/examples/video/doc/images/qmlvideofx-camera-magnify.png b/examples/multimedia/video/doc/images/qmlvideofx-camera-magnify.png similarity index 100% rename from examples/video/doc/images/qmlvideofx-camera-magnify.png rename to examples/multimedia/video/doc/images/qmlvideofx-camera-magnify.png diff --git a/examples/video/doc/images/qmlvideofx-effects-menu.png b/examples/multimedia/video/doc/images/qmlvideofx-effects-menu.png similarity index 100% rename from examples/video/doc/images/qmlvideofx-effects-menu.png rename to examples/multimedia/video/doc/images/qmlvideofx-effects-menu.png diff --git a/examples/video/doc/images/qmlvideofx-source-menu.png b/examples/multimedia/video/doc/images/qmlvideofx-source-menu.png similarity index 100% rename from examples/video/doc/images/qmlvideofx-source-menu.png rename to examples/multimedia/video/doc/images/qmlvideofx-source-menu.png diff --git a/examples/video/doc/images/qmlvideofx-video-edgedetection.png b/examples/multimedia/video/doc/images/qmlvideofx-video-edgedetection.png similarity index 100% rename from examples/video/doc/images/qmlvideofx-video-edgedetection.png rename to examples/multimedia/video/doc/images/qmlvideofx-video-edgedetection.png diff --git a/examples/video/doc/images/qmlvideofx-video-pagecurl.png b/examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.png similarity index 100% rename from examples/video/doc/images/qmlvideofx-video-pagecurl.png rename to examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.png diff --git a/examples/video/doc/images/video-qml-paint-rate.png b/examples/multimedia/video/doc/images/video-qml-paint-rate.png similarity index 100% rename from examples/video/doc/images/video-qml-paint-rate.png rename to examples/multimedia/video/doc/images/video-qml-paint-rate.png diff --git a/examples/video/doc/src/qmlvideo.qdoc b/examples/multimedia/video/doc/src/qmlvideo.qdoc similarity index 100% rename from examples/video/doc/src/qmlvideo.qdoc rename to examples/multimedia/video/doc/src/qmlvideo.qdoc diff --git a/examples/video/doc/src/qmlvideofx.qdoc b/examples/multimedia/video/doc/src/qmlvideofx.qdoc similarity index 100% rename from examples/video/doc/src/qmlvideofx.qdoc rename to examples/multimedia/video/doc/src/qmlvideofx.qdoc diff --git a/examples/video/doc/src/video-qml-paint-rate.qdocinc b/examples/multimedia/video/doc/src/video-qml-paint-rate.qdocinc similarity index 100% rename from examples/video/doc/src/video-qml-paint-rate.qdocinc rename to examples/multimedia/video/doc/src/video-qml-paint-rate.qdocinc diff --git a/examples/video/qmlvideo/images/close.png b/examples/multimedia/video/qmlvideo/images/close.png similarity index 100% rename from examples/video/qmlvideo/images/close.png rename to examples/multimedia/video/qmlvideo/images/close.png diff --git a/examples/video/qmlvideo/images/folder.png b/examples/multimedia/video/qmlvideo/images/folder.png similarity index 100% rename from examples/video/qmlvideo/images/folder.png rename to examples/multimedia/video/qmlvideo/images/folder.png diff --git a/examples/video/qmlvideo/images/leaves.jpg b/examples/multimedia/video/qmlvideo/images/leaves.jpg similarity index 100% rename from examples/video/qmlvideo/images/leaves.jpg rename to examples/multimedia/video/qmlvideo/images/leaves.jpg diff --git a/examples/video/qmlvideo/images/progress_handle.svg b/examples/multimedia/video/qmlvideo/images/progress_handle.svg similarity index 100% rename from examples/video/qmlvideo/images/progress_handle.svg rename to examples/multimedia/video/qmlvideo/images/progress_handle.svg diff --git a/examples/video/qmlvideo/images/progress_handle_pressed.svg b/examples/multimedia/video/qmlvideo/images/progress_handle_pressed.svg similarity index 100% rename from examples/video/qmlvideo/images/progress_handle_pressed.svg rename to examples/multimedia/video/qmlvideo/images/progress_handle_pressed.svg diff --git a/examples/video/qmlvideo/images/titlebar.png b/examples/multimedia/video/qmlvideo/images/titlebar.png similarity index 100% rename from examples/video/qmlvideo/images/titlebar.png rename to examples/multimedia/video/qmlvideo/images/titlebar.png diff --git a/examples/video/qmlvideo/images/titlebar.sci b/examples/multimedia/video/qmlvideo/images/titlebar.sci similarity index 100% rename from examples/video/qmlvideo/images/titlebar.sci rename to examples/multimedia/video/qmlvideo/images/titlebar.sci diff --git a/examples/video/qmlvideo/images/up.png b/examples/multimedia/video/qmlvideo/images/up.png similarity index 100% rename from examples/video/qmlvideo/images/up.png rename to examples/multimedia/video/qmlvideo/images/up.png diff --git a/examples/video/qmlvideo/main.cpp b/examples/multimedia/video/qmlvideo/main.cpp similarity index 100% rename from examples/video/qmlvideo/main.cpp rename to examples/multimedia/video/qmlvideo/main.cpp diff --git a/examples/video/qmlvideo/qml/qmlvideo/Button.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Button.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/Button.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/Button.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraBasic.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraBasic.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/CameraBasic.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraBasic.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraDrag.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDrag.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/CameraDrag.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDrag.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraDummy.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/CameraDummy.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraItem.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraItem.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/CameraItem.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraItem.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraMove.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraMove.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/CameraMove.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraMove.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraResize.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraResize.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/CameraResize.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraResize.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraRotate.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraRotate.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/CameraRotate.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraRotate.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraSpin.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraSpin.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/CameraSpin.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraSpin.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/Content.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Content.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/Content.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/Content.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/FileBrowser.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/FileBrowser.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/Scene.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Scene.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/Scene.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/Scene.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneBasic.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/SceneBasic.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneDrag.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneDrag.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/SceneDrag.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneDrag.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneMove.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMove.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/SceneMove.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMove.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneMulti.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMulti.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/SceneMulti.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMulti.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneResize.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneResize.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/SceneResize.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneResize.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneRotate.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneRotate.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/SceneRotate.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneRotate.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneSpin.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSpin.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/SceneSpin.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSpin.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/SeekControl.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SeekControl.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/SeekControl.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/SeekControl.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoBasic.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoBasic.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/VideoBasic.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoBasic.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoDrag.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDrag.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/VideoDrag.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDrag.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoDummy.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/VideoDummy.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoItem.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/VideoItem.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoMove.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMove.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/VideoMove.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMove.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoResize.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoResize.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/VideoResize.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoResize.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoRotate.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoRotate.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/VideoRotate.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoRotate.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoSeek.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSeek.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/VideoSeek.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSeek.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoSpin.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSpin.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/VideoSpin.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSpin.qml diff --git a/examples/video/qmlvideo/qml/qmlvideo/main.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml similarity index 100% rename from examples/video/qmlvideo/qml/qmlvideo/main.qml rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml diff --git a/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp similarity index 100% rename from examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp rename to examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp diff --git a/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h b/examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h similarity index 100% rename from examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h rename to examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h diff --git a/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri b/examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri similarity index 100% rename from examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri rename to examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri diff --git a/examples/video/qmlvideo/qmlvideo.png b/examples/multimedia/video/qmlvideo/qmlvideo.png similarity index 100% rename from examples/video/qmlvideo/qmlvideo.png rename to examples/multimedia/video/qmlvideo/qmlvideo.png diff --git a/examples/video/qmlvideo/qmlvideo.pro b/examples/multimedia/video/qmlvideo/qmlvideo.pro similarity index 52% rename from examples/video/qmlvideo/qmlvideo.pro rename to examples/multimedia/video/qmlvideo/qmlvideo.pro index 737d0404..78c6f054 100644 --- a/examples/video/qmlvideo/qmlvideo.pro +++ b/examples/multimedia/video/qmlvideo/qmlvideo.pro @@ -13,9 +13,6 @@ include($$SNIPPETS_PATH/performancemonitor/performancemonitordeclarative.pri) include(qmlapplicationviewer/qmlapplicationviewer.pri) -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/video/qmlvideo -sources.files = $$LOCAL_SOURCES $$LOCAL_HEADERS $$RESOURCES *.pro images qmlapplicationviewer qmlvideo.png qml qmlvideo.svg -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/video/qmlvideo -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/video/qmlvideo +INSTALLS += target diff --git a/examples/video/qmlvideo/qmlvideo.qrc b/examples/multimedia/video/qmlvideo/qmlvideo.qrc similarity index 100% rename from examples/video/qmlvideo/qmlvideo.qrc rename to examples/multimedia/video/qmlvideo/qmlvideo.qrc diff --git a/examples/video/qmlvideo/qmlvideo.svg b/examples/multimedia/video/qmlvideo/qmlvideo.svg similarity index 100% rename from examples/video/qmlvideo/qmlvideo.svg rename to examples/multimedia/video/qmlvideo/qmlvideo.svg diff --git a/examples/video/qmlvideo/trace.h b/examples/multimedia/video/qmlvideo/trace.h similarity index 100% rename from examples/video/qmlvideo/trace.h rename to examples/multimedia/video/qmlvideo/trace.h diff --git a/examples/video/qmlvideofx/filereader.cpp b/examples/multimedia/video/qmlvideofx/filereader.cpp similarity index 100% rename from examples/video/qmlvideofx/filereader.cpp rename to examples/multimedia/video/qmlvideofx/filereader.cpp diff --git a/examples/video/qmlvideofx/filereader.h b/examples/multimedia/video/qmlvideofx/filereader.h similarity index 100% rename from examples/video/qmlvideofx/filereader.h rename to examples/multimedia/video/qmlvideofx/filereader.h diff --git a/examples/video/qmlvideofx/images/close.png b/examples/multimedia/video/qmlvideofx/images/close.png similarity index 100% rename from examples/video/qmlvideofx/images/close.png rename to examples/multimedia/video/qmlvideofx/images/close.png diff --git a/examples/video/qmlvideofx/images/folder.png b/examples/multimedia/video/qmlvideofx/images/folder.png similarity index 100% rename from examples/video/qmlvideofx/images/folder.png rename to examples/multimedia/video/qmlvideofx/images/folder.png diff --git a/examples/video/qmlvideofx/images/qt-logo.png b/examples/multimedia/video/qmlvideofx/images/qt-logo.png similarity index 100% rename from examples/video/qmlvideofx/images/qt-logo.png rename to examples/multimedia/video/qmlvideofx/images/qt-logo.png diff --git a/examples/video/qmlvideofx/images/titlebar.png b/examples/multimedia/video/qmlvideofx/images/titlebar.png similarity index 100% rename from examples/video/qmlvideofx/images/titlebar.png rename to examples/multimedia/video/qmlvideofx/images/titlebar.png diff --git a/examples/video/qmlvideofx/images/titlebar.sci b/examples/multimedia/video/qmlvideofx/images/titlebar.sci similarity index 100% rename from examples/video/qmlvideofx/images/titlebar.sci rename to examples/multimedia/video/qmlvideofx/images/titlebar.sci diff --git a/examples/video/qmlvideofx/images/up.png b/examples/multimedia/video/qmlvideofx/images/up.png similarity index 100% rename from examples/video/qmlvideofx/images/up.png rename to examples/multimedia/video/qmlvideofx/images/up.png diff --git a/examples/video/qmlvideofx/main.cpp b/examples/multimedia/video/qmlvideofx/main.cpp similarity index 100% rename from examples/video/qmlvideofx/main.cpp rename to examples/multimedia/video/qmlvideofx/main.cpp diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/Button.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Button.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/Button.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Button.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/Content.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/Content.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/Divider.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Divider.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/Divider.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Divider.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/Effect.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Effect.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/Effect.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Effect.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/Slider.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Slider.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/Slider.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Slider.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/main-largescreen.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/main-largescreen.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/main-largescreen.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/main-largescreen.qml diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/main-smallscreen.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/main-smallscreen.qml similarity index 100% rename from examples/video/qmlvideofx/qml/qmlvideofx/main-smallscreen.qml rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/main-smallscreen.qml diff --git a/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp similarity index 100% rename from examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp rename to examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp diff --git a/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h b/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h similarity index 100% rename from examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h rename to examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h diff --git a/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri b/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri similarity index 100% rename from examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri rename to examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri diff --git a/examples/video/qmlvideofx/qmlvideofx.png b/examples/multimedia/video/qmlvideofx/qmlvideofx.png similarity index 100% rename from examples/video/qmlvideofx/qmlvideofx.png rename to examples/multimedia/video/qmlvideofx/qmlvideofx.png diff --git a/examples/video/qmlvideofx/qmlvideofx.pro b/examples/multimedia/video/qmlvideofx/qmlvideofx.pro similarity index 58% rename from examples/video/qmlvideofx/qmlvideofx.pro rename to examples/multimedia/video/qmlvideofx/qmlvideofx.pro index d556fd77..7779565f 100644 --- a/examples/video/qmlvideofx/qmlvideofx.pro +++ b/examples/multimedia/video/qmlvideofx/qmlvideofx.pro @@ -19,8 +19,5 @@ maemo6: { include(qmlapplicationviewer/qmlapplicationviewer.pri) -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/video/qmlvideofx -sources.files = $$LOCAL_SOURCES $$LOCAL_HEADERS $$RESOURCES *.pro images qmlapplicationviewer qmlvideofx.png shaders qml qmlvideofx.svg -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/video/qmlvideofx -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/video/qmlvideofx +INSTALLS += target diff --git a/examples/video/qmlvideofx/qmlvideofx.qrc b/examples/multimedia/video/qmlvideofx/qmlvideofx.qrc similarity index 100% rename from examples/video/qmlvideofx/qmlvideofx.qrc rename to examples/multimedia/video/qmlvideofx/qmlvideofx.qrc diff --git a/examples/video/qmlvideofx/qmlvideofx.svg b/examples/multimedia/video/qmlvideofx/qmlvideofx.svg similarity index 100% rename from examples/video/qmlvideofx/qmlvideofx.svg rename to examples/multimedia/video/qmlvideofx/qmlvideofx.svg diff --git a/examples/video/qmlvideofx/shaders/billboard.fsh b/examples/multimedia/video/qmlvideofx/shaders/billboard.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/billboard.fsh rename to examples/multimedia/video/qmlvideofx/shaders/billboard.fsh diff --git a/examples/video/qmlvideofx/shaders/blackandwhite.fsh b/examples/multimedia/video/qmlvideofx/shaders/blackandwhite.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/blackandwhite.fsh rename to examples/multimedia/video/qmlvideofx/shaders/blackandwhite.fsh diff --git a/examples/video/qmlvideofx/shaders/emboss.fsh b/examples/multimedia/video/qmlvideofx/shaders/emboss.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/emboss.fsh rename to examples/multimedia/video/qmlvideofx/shaders/emboss.fsh diff --git a/examples/video/qmlvideofx/shaders/gaussianblur_h.fsh b/examples/multimedia/video/qmlvideofx/shaders/gaussianblur_h.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/gaussianblur_h.fsh rename to examples/multimedia/video/qmlvideofx/shaders/gaussianblur_h.fsh diff --git a/examples/video/qmlvideofx/shaders/gaussianblur_v.fsh b/examples/multimedia/video/qmlvideofx/shaders/gaussianblur_v.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/gaussianblur_v.fsh rename to examples/multimedia/video/qmlvideofx/shaders/gaussianblur_v.fsh diff --git a/examples/video/qmlvideofx/shaders/glow.fsh b/examples/multimedia/video/qmlvideofx/shaders/glow.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/glow.fsh rename to examples/multimedia/video/qmlvideofx/shaders/glow.fsh diff --git a/examples/video/qmlvideofx/shaders/isolate.fsh b/examples/multimedia/video/qmlvideofx/shaders/isolate.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/isolate.fsh rename to examples/multimedia/video/qmlvideofx/shaders/isolate.fsh diff --git a/examples/video/qmlvideofx/shaders/magnify.fsh b/examples/multimedia/video/qmlvideofx/shaders/magnify.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/magnify.fsh rename to examples/multimedia/video/qmlvideofx/shaders/magnify.fsh diff --git a/examples/video/qmlvideofx/shaders/pagecurl.fsh b/examples/multimedia/video/qmlvideofx/shaders/pagecurl.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/pagecurl.fsh rename to examples/multimedia/video/qmlvideofx/shaders/pagecurl.fsh diff --git a/examples/video/qmlvideofx/shaders/pixelate.fsh b/examples/multimedia/video/qmlvideofx/shaders/pixelate.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/pixelate.fsh rename to examples/multimedia/video/qmlvideofx/shaders/pixelate.fsh diff --git a/examples/video/qmlvideofx/shaders/posterize.fsh b/examples/multimedia/video/qmlvideofx/shaders/posterize.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/posterize.fsh rename to examples/multimedia/video/qmlvideofx/shaders/posterize.fsh diff --git a/examples/video/qmlvideofx/shaders/ripple.fsh b/examples/multimedia/video/qmlvideofx/shaders/ripple.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/ripple.fsh rename to examples/multimedia/video/qmlvideofx/shaders/ripple.fsh diff --git a/examples/video/qmlvideofx/shaders/selectionpanel.fsh b/examples/multimedia/video/qmlvideofx/shaders/selectionpanel.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/selectionpanel.fsh rename to examples/multimedia/video/qmlvideofx/shaders/selectionpanel.fsh diff --git a/examples/video/qmlvideofx/shaders/sepia.fsh b/examples/multimedia/video/qmlvideofx/shaders/sepia.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/sepia.fsh rename to examples/multimedia/video/qmlvideofx/shaders/sepia.fsh diff --git a/examples/video/qmlvideofx/shaders/sharpen.fsh b/examples/multimedia/video/qmlvideofx/shaders/sharpen.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/sharpen.fsh rename to examples/multimedia/video/qmlvideofx/shaders/sharpen.fsh diff --git a/examples/video/qmlvideofx/shaders/shockwave.fsh b/examples/multimedia/video/qmlvideofx/shaders/shockwave.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/shockwave.fsh rename to examples/multimedia/video/qmlvideofx/shaders/shockwave.fsh diff --git a/examples/video/qmlvideofx/shaders/sobeledgedetection1.fsh b/examples/multimedia/video/qmlvideofx/shaders/sobeledgedetection1.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/sobeledgedetection1.fsh rename to examples/multimedia/video/qmlvideofx/shaders/sobeledgedetection1.fsh diff --git a/examples/video/qmlvideofx/shaders/sobeledgedetection2.fsh b/examples/multimedia/video/qmlvideofx/shaders/sobeledgedetection2.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/sobeledgedetection2.fsh rename to examples/multimedia/video/qmlvideofx/shaders/sobeledgedetection2.fsh diff --git a/examples/video/qmlvideofx/shaders/tiltshift.fsh b/examples/multimedia/video/qmlvideofx/shaders/tiltshift.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/tiltshift.fsh rename to examples/multimedia/video/qmlvideofx/shaders/tiltshift.fsh diff --git a/examples/video/qmlvideofx/shaders/toon.fsh b/examples/multimedia/video/qmlvideofx/shaders/toon.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/toon.fsh rename to examples/multimedia/video/qmlvideofx/shaders/toon.fsh diff --git a/examples/video/qmlvideofx/shaders/vignette.fsh b/examples/multimedia/video/qmlvideofx/shaders/vignette.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/vignette.fsh rename to examples/multimedia/video/qmlvideofx/shaders/vignette.fsh diff --git a/examples/video/qmlvideofx/shaders/warhol.fsh b/examples/multimedia/video/qmlvideofx/shaders/warhol.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/warhol.fsh rename to examples/multimedia/video/qmlvideofx/shaders/warhol.fsh diff --git a/examples/video/qmlvideofx/shaders/wobble.fsh b/examples/multimedia/video/qmlvideofx/shaders/wobble.fsh similarity index 100% rename from examples/video/qmlvideofx/shaders/wobble.fsh rename to examples/multimedia/video/qmlvideofx/shaders/wobble.fsh diff --git a/examples/video/qmlvideofx/trace.h b/examples/multimedia/video/qmlvideofx/trace.h similarity index 100% rename from examples/video/qmlvideofx/trace.h rename to examples/multimedia/video/qmlvideofx/trace.h diff --git a/examples/video/snippets/frequencymonitor/frequencymonitor.cpp b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp similarity index 100% rename from examples/video/snippets/frequencymonitor/frequencymonitor.cpp rename to examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp diff --git a/examples/video/snippets/frequencymonitor/frequencymonitor.h b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.h similarity index 100% rename from examples/video/snippets/frequencymonitor/frequencymonitor.h rename to examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.h diff --git a/examples/video/snippets/frequencymonitor/frequencymonitor.pri b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.pri similarity index 100% rename from examples/video/snippets/frequencymonitor/frequencymonitor.pri rename to examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.pri diff --git a/examples/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp similarity index 100% rename from examples/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp rename to examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp diff --git a/examples/video/snippets/frequencymonitor/frequencymonitordeclarative.pri b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.pri similarity index 100% rename from examples/video/snippets/frequencymonitor/frequencymonitordeclarative.pri rename to examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.pri diff --git a/examples/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml b/examples/multimedia/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml similarity index 100% rename from examples/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml rename to examples/multimedia/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml diff --git a/examples/video/snippets/performancemonitor/performancemonitor.cpp b/examples/multimedia/video/snippets/performancemonitor/performancemonitor.cpp similarity index 100% rename from examples/video/snippets/performancemonitor/performancemonitor.cpp rename to examples/multimedia/video/snippets/performancemonitor/performancemonitor.cpp diff --git a/examples/video/snippets/performancemonitor/performancemonitor.h b/examples/multimedia/video/snippets/performancemonitor/performancemonitor.h similarity index 100% rename from examples/video/snippets/performancemonitor/performancemonitor.h rename to examples/multimedia/video/snippets/performancemonitor/performancemonitor.h diff --git a/examples/video/snippets/performancemonitor/performancemonitor.pri b/examples/multimedia/video/snippets/performancemonitor/performancemonitor.pri similarity index 100% rename from examples/video/snippets/performancemonitor/performancemonitor.pri rename to examples/multimedia/video/snippets/performancemonitor/performancemonitor.pri diff --git a/examples/video/snippets/performancemonitor/performancemonitordeclarative.cpp b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.cpp similarity index 100% rename from examples/video/snippets/performancemonitor/performancemonitordeclarative.cpp rename to examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.cpp diff --git a/examples/video/snippets/performancemonitor/performancemonitordeclarative.h b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.h similarity index 100% rename from examples/video/snippets/performancemonitor/performancemonitordeclarative.h rename to examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.h diff --git a/examples/video/snippets/performancemonitor/performancemonitordeclarative.pri b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.pri similarity index 100% rename from examples/video/snippets/performancemonitor/performancemonitordeclarative.pri rename to examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.pri diff --git a/examples/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml b/examples/multimedia/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml similarity index 100% rename from examples/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml rename to examples/multimedia/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml diff --git a/examples/multimedia/video/video.pro b/examples/multimedia/video/video.pro new file mode 100644 index 00000000..3127a4e4 --- /dev/null +++ b/examples/multimedia/video/video.pro @@ -0,0 +1,4 @@ +TEMPLATE = subdirs + +SUBDIRS += qmlvideo qmlvideofx + diff --git a/examples/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp similarity index 100% rename from examples/camera/camera.cpp rename to examples/multimediawidgets/camera/camera.cpp diff --git a/examples/camera/camera.h b/examples/multimediawidgets/camera/camera.h similarity index 100% rename from examples/camera/camera.h rename to examples/multimediawidgets/camera/camera.h diff --git a/examples/camera/camera.pro b/examples/multimediawidgets/camera/camera.pro similarity index 60% rename from examples/camera/camera.pro rename to examples/multimediawidgets/camera/camera.pro index f7dd8b78..fe8f3938 100644 --- a/examples/camera/camera.pro +++ b/examples/multimediawidgets/camera/camera.pro @@ -19,10 +19,7 @@ FORMS += \ videosettings.ui \ imagesettings.ui -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/camera -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/camera - -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/camera +INSTALLS += target QT+=widgets diff --git a/examples/camera/camera.ui b/examples/multimediawidgets/camera/camera.ui similarity index 100% rename from examples/camera/camera.ui rename to examples/multimediawidgets/camera/camera.ui diff --git a/examples/camera/doc/images/camera-example.png b/examples/multimediawidgets/camera/doc/images/camera-example.png similarity index 100% rename from examples/camera/doc/images/camera-example.png rename to examples/multimediawidgets/camera/doc/images/camera-example.png diff --git a/examples/camera/doc/src/camera.qdoc b/examples/multimediawidgets/camera/doc/src/camera.qdoc similarity index 100% rename from examples/camera/doc/src/camera.qdoc rename to examples/multimediawidgets/camera/doc/src/camera.qdoc diff --git a/examples/camera/imagesettings.cpp b/examples/multimediawidgets/camera/imagesettings.cpp similarity index 100% rename from examples/camera/imagesettings.cpp rename to examples/multimediawidgets/camera/imagesettings.cpp diff --git a/examples/camera/imagesettings.h b/examples/multimediawidgets/camera/imagesettings.h similarity index 100% rename from examples/camera/imagesettings.h rename to examples/multimediawidgets/camera/imagesettings.h diff --git a/examples/camera/imagesettings.ui b/examples/multimediawidgets/camera/imagesettings.ui similarity index 100% rename from examples/camera/imagesettings.ui rename to examples/multimediawidgets/camera/imagesettings.ui diff --git a/examples/camera/main.cpp b/examples/multimediawidgets/camera/main.cpp similarity index 100% rename from examples/camera/main.cpp rename to examples/multimediawidgets/camera/main.cpp diff --git a/examples/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp similarity index 100% rename from examples/camera/videosettings.cpp rename to examples/multimediawidgets/camera/videosettings.cpp diff --git a/examples/camera/videosettings.h b/examples/multimediawidgets/camera/videosettings.h similarity index 100% rename from examples/camera/videosettings.h rename to examples/multimediawidgets/camera/videosettings.h diff --git a/examples/camera/videosettings.ui b/examples/multimediawidgets/camera/videosettings.ui similarity index 100% rename from examples/camera/videosettings.ui rename to examples/multimediawidgets/camera/videosettings.ui diff --git a/examples/customvideosurface/customvideoitem/customvideoitem.pro b/examples/multimediawidgets/customvideosurface/customvideoitem/customvideoitem.pro similarity index 50% rename from examples/customvideosurface/customvideoitem/customvideoitem.pro rename to examples/multimediawidgets/customvideosurface/customvideoitem/customvideoitem.pro index 70503898..387e494c 100644 --- a/examples/customvideosurface/customvideoitem/customvideoitem.pro +++ b/examples/multimediawidgets/customvideosurface/customvideoitem/customvideoitem.pro @@ -12,8 +12,5 @@ SOURCES += main.cpp \ videoplayer.cpp \ videoitem.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideosurface/customvideoitem -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideosurface/customvideoitem - -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/customvideosurface/customvideoitem +INSTALLS += target diff --git a/examples/customvideosurface/customvideoitem/main.cpp b/examples/multimediawidgets/customvideosurface/customvideoitem/main.cpp similarity index 100% rename from examples/customvideosurface/customvideoitem/main.cpp rename to examples/multimediawidgets/customvideosurface/customvideoitem/main.cpp diff --git a/examples/customvideosurface/customvideoitem/videoitem.cpp b/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.cpp similarity index 100% rename from examples/customvideosurface/customvideoitem/videoitem.cpp rename to examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.cpp diff --git a/examples/customvideosurface/customvideoitem/videoitem.h b/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h similarity index 100% rename from examples/customvideosurface/customvideoitem/videoitem.h rename to examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h diff --git a/examples/customvideosurface/customvideoitem/videoplayer.cpp b/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.cpp similarity index 100% rename from examples/customvideosurface/customvideoitem/videoplayer.cpp rename to examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.cpp diff --git a/examples/customvideosurface/customvideoitem/videoplayer.h b/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.h similarity index 100% rename from examples/customvideosurface/customvideoitem/videoplayer.h rename to examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.h diff --git a/examples/multimediawidgets/customvideosurface/customvideosurface.pro b/examples/multimediawidgets/customvideosurface/customvideosurface.pro new file mode 100644 index 00000000..baffdaba --- /dev/null +++ b/examples/multimediawidgets/customvideosurface/customvideosurface.pro @@ -0,0 +1,4 @@ +TEMPLATE = subdirs + +SUBDIRS += customvideoitem customvideowidget + diff --git a/examples/multimediawidgets/customvideosurface/customvideowidget/customvideowidget.pro b/examples/multimediawidgets/customvideosurface/customvideowidget/customvideowidget.pro new file mode 100644 index 00000000..b4476dfb --- /dev/null +++ b/examples/multimediawidgets/customvideosurface/customvideowidget/customvideowidget.pro @@ -0,0 +1,18 @@ +TEMPLATE = app +TARGET = customvideowidget + +QT += multimedia multimediawidgets widgets + +HEADERS = \ + videoplayer.h \ + videowidget.h \ + videowidgetsurface.h + +SOURCES = \ + main.cpp \ + videoplayer.cpp \ + videowidget.cpp \ + videowidgetsurface.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/customvideosurface/customvideowidget +INSTALLS += target diff --git a/examples/customvideosurface/customvideowidget/main.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/main.cpp similarity index 100% rename from examples/customvideosurface/customvideowidget/main.cpp rename to examples/multimediawidgets/customvideosurface/customvideowidget/main.cpp diff --git a/examples/customvideosurface/customvideowidget/videoplayer.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.cpp similarity index 100% rename from examples/customvideosurface/customvideowidget/videoplayer.cpp rename to examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.cpp diff --git a/examples/customvideosurface/customvideowidget/videoplayer.h b/examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.h similarity index 100% rename from examples/customvideosurface/customvideowidget/videoplayer.h rename to examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.h diff --git a/examples/customvideosurface/customvideowidget/videowidget.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp similarity index 100% rename from examples/customvideosurface/customvideowidget/videowidget.cpp rename to examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp diff --git a/examples/customvideosurface/customvideowidget/videowidget.h b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.h similarity index 100% rename from examples/customvideosurface/customvideowidget/videowidget.h rename to examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.h diff --git a/examples/customvideosurface/customvideowidget/videowidgetsurface.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.cpp similarity index 100% rename from examples/customvideosurface/customvideowidget/videowidgetsurface.cpp rename to examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.cpp diff --git a/examples/customvideosurface/customvideowidget/videowidgetsurface.h b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h similarity index 100% rename from examples/customvideosurface/customvideowidget/videowidgetsurface.h rename to examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h diff --git a/examples/declarative-camera/CameraButton.qml b/examples/multimediawidgets/declarative-camera/CameraButton.qml similarity index 100% rename from examples/declarative-camera/CameraButton.qml rename to examples/multimediawidgets/declarative-camera/CameraButton.qml diff --git a/examples/declarative-camera/CameraPropertyButton.qml b/examples/multimediawidgets/declarative-camera/CameraPropertyButton.qml similarity index 100% rename from examples/declarative-camera/CameraPropertyButton.qml rename to examples/multimediawidgets/declarative-camera/CameraPropertyButton.qml diff --git a/examples/declarative-camera/CameraPropertyPopup.qml b/examples/multimediawidgets/declarative-camera/CameraPropertyPopup.qml similarity index 100% rename from examples/declarative-camera/CameraPropertyPopup.qml rename to examples/multimediawidgets/declarative-camera/CameraPropertyPopup.qml diff --git a/examples/declarative-camera/FocusButton.qml b/examples/multimediawidgets/declarative-camera/FocusButton.qml similarity index 100% rename from examples/declarative-camera/FocusButton.qml rename to examples/multimediawidgets/declarative-camera/FocusButton.qml diff --git a/examples/declarative-camera/PhotoCaptureControls.qml b/examples/multimediawidgets/declarative-camera/PhotoCaptureControls.qml similarity index 100% rename from examples/declarative-camera/PhotoCaptureControls.qml rename to examples/multimediawidgets/declarative-camera/PhotoCaptureControls.qml diff --git a/examples/declarative-camera/PhotoPreview.qml b/examples/multimediawidgets/declarative-camera/PhotoPreview.qml similarity index 100% rename from examples/declarative-camera/PhotoPreview.qml rename to examples/multimediawidgets/declarative-camera/PhotoPreview.qml diff --git a/examples/declarative-camera/VideoCaptureControls.qml b/examples/multimediawidgets/declarative-camera/VideoCaptureControls.qml similarity index 100% rename from examples/declarative-camera/VideoCaptureControls.qml rename to examples/multimediawidgets/declarative-camera/VideoCaptureControls.qml diff --git a/examples/declarative-camera/VideoPreview.qml b/examples/multimediawidgets/declarative-camera/VideoPreview.qml similarity index 100% rename from examples/declarative-camera/VideoPreview.qml rename to examples/multimediawidgets/declarative-camera/VideoPreview.qml diff --git a/examples/declarative-camera/ZoomControl.qml b/examples/multimediawidgets/declarative-camera/ZoomControl.qml similarity index 100% rename from examples/declarative-camera/ZoomControl.qml rename to examples/multimediawidgets/declarative-camera/ZoomControl.qml diff --git a/examples/multimediawidgets/declarative-camera/declarative-camera.pro b/examples/multimediawidgets/declarative-camera/declarative-camera.pro new file mode 100644 index 00000000..c52a1d1e --- /dev/null +++ b/examples/multimediawidgets/declarative-camera/declarative-camera.pro @@ -0,0 +1,10 @@ +TEMPLATE=app +TARGET=declarative-camera + +QT += quick qml multimedia + +SOURCES += qmlcamera.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/declarative-camera +INSTALLS += target + diff --git a/examples/declarative-camera/declarative-camera.qml b/examples/multimediawidgets/declarative-camera/declarative-camera.qml similarity index 100% rename from examples/declarative-camera/declarative-camera.qml rename to examples/multimediawidgets/declarative-camera/declarative-camera.qml diff --git a/examples/declarative-camera/declarative-camera.qmlproject b/examples/multimediawidgets/declarative-camera/declarative-camera.qmlproject similarity index 100% rename from examples/declarative-camera/declarative-camera.qmlproject rename to examples/multimediawidgets/declarative-camera/declarative-camera.qmlproject diff --git a/examples/declarative-camera/doc/images/qml-camera.png b/examples/multimediawidgets/declarative-camera/doc/images/qml-camera.png similarity index 100% rename from examples/declarative-camera/doc/images/qml-camera.png rename to examples/multimediawidgets/declarative-camera/doc/images/qml-camera.png diff --git a/examples/declarative-camera/doc/src/declarative-camera.qdoc b/examples/multimediawidgets/declarative-camera/doc/src/declarative-camera.qdoc similarity index 100% rename from examples/declarative-camera/doc/src/declarative-camera.qdoc rename to examples/multimediawidgets/declarative-camera/doc/src/declarative-camera.qdoc diff --git a/examples/declarative-camera/images/camera_auto_mode.png b/examples/multimediawidgets/declarative-camera/images/camera_auto_mode.png similarity index 100% rename from examples/declarative-camera/images/camera_auto_mode.png rename to examples/multimediawidgets/declarative-camera/images/camera_auto_mode.png diff --git a/examples/declarative-camera/images/camera_camera_setting.png b/examples/multimediawidgets/declarative-camera/images/camera_camera_setting.png similarity index 100% rename from examples/declarative-camera/images/camera_camera_setting.png rename to examples/multimediawidgets/declarative-camera/images/camera_camera_setting.png diff --git a/examples/declarative-camera/images/camera_flash_auto.png b/examples/multimediawidgets/declarative-camera/images/camera_flash_auto.png similarity index 100% rename from examples/declarative-camera/images/camera_flash_auto.png rename to examples/multimediawidgets/declarative-camera/images/camera_flash_auto.png diff --git a/examples/declarative-camera/images/camera_flash_fill.png b/examples/multimediawidgets/declarative-camera/images/camera_flash_fill.png similarity index 100% rename from examples/declarative-camera/images/camera_flash_fill.png rename to examples/multimediawidgets/declarative-camera/images/camera_flash_fill.png diff --git a/examples/declarative-camera/images/camera_flash_off.png b/examples/multimediawidgets/declarative-camera/images/camera_flash_off.png similarity index 100% rename from examples/declarative-camera/images/camera_flash_off.png rename to examples/multimediawidgets/declarative-camera/images/camera_flash_off.png diff --git a/examples/declarative-camera/images/camera_flash_redeye.png b/examples/multimediawidgets/declarative-camera/images/camera_flash_redeye.png similarity index 100% rename from examples/declarative-camera/images/camera_flash_redeye.png rename to examples/multimediawidgets/declarative-camera/images/camera_flash_redeye.png diff --git a/examples/declarative-camera/images/camera_white_balance_cloudy.png b/examples/multimediawidgets/declarative-camera/images/camera_white_balance_cloudy.png similarity index 100% rename from examples/declarative-camera/images/camera_white_balance_cloudy.png rename to examples/multimediawidgets/declarative-camera/images/camera_white_balance_cloudy.png diff --git a/examples/declarative-camera/images/camera_white_balance_flourescent.png b/examples/multimediawidgets/declarative-camera/images/camera_white_balance_flourescent.png similarity index 100% rename from examples/declarative-camera/images/camera_white_balance_flourescent.png rename to examples/multimediawidgets/declarative-camera/images/camera_white_balance_flourescent.png diff --git a/examples/declarative-camera/images/camera_white_balance_incandescent.png b/examples/multimediawidgets/declarative-camera/images/camera_white_balance_incandescent.png similarity index 100% rename from examples/declarative-camera/images/camera_white_balance_incandescent.png rename to examples/multimediawidgets/declarative-camera/images/camera_white_balance_incandescent.png diff --git a/examples/declarative-camera/images/camera_white_balance_sunny.png b/examples/multimediawidgets/declarative-camera/images/camera_white_balance_sunny.png similarity index 100% rename from examples/declarative-camera/images/camera_white_balance_sunny.png rename to examples/multimediawidgets/declarative-camera/images/camera_white_balance_sunny.png diff --git a/examples/declarative-camera/images/toolbutton.png b/examples/multimediawidgets/declarative-camera/images/toolbutton.png similarity index 100% rename from examples/declarative-camera/images/toolbutton.png rename to examples/multimediawidgets/declarative-camera/images/toolbutton.png diff --git a/examples/declarative-camera/images/toolbutton.sci b/examples/multimediawidgets/declarative-camera/images/toolbutton.sci similarity index 100% rename from examples/declarative-camera/images/toolbutton.sci rename to examples/multimediawidgets/declarative-camera/images/toolbutton.sci diff --git a/examples/declarative-camera/qmlcamera.cpp b/examples/multimediawidgets/declarative-camera/qmlcamera.cpp similarity index 100% rename from examples/declarative-camera/qmlcamera.cpp rename to examples/multimediawidgets/declarative-camera/qmlcamera.cpp diff --git a/examples/multimediawidgets/multimediawidgets.pro b/examples/multimediawidgets/multimediawidgets.pro new file mode 100644 index 00000000..29d07bb3 --- /dev/null +++ b/examples/multimediawidgets/multimediawidgets.pro @@ -0,0 +1,18 @@ +TEMPLATE = subdirs + +# These examples all need widgets for now (using creator templates that use widgets) +!isEmpty(QT.widgets.name) { + SUBDIRS += \ + camera \ + videographicsitem \ + videowidget \ + player \ + customvideosurface + + QT += widgets +} + +!isEmpty(QT.gui.name):!isEmpty(QT.qml.name) { + disabled:SUBDIRS += declarative-camera +} + diff --git a/examples/player/doc/src/player.qdoc b/examples/multimediawidgets/player/doc/src/player.qdoc similarity index 100% rename from examples/player/doc/src/player.qdoc rename to examples/multimediawidgets/player/doc/src/player.qdoc diff --git a/examples/player/histogramwidget.cpp b/examples/multimediawidgets/player/histogramwidget.cpp similarity index 100% rename from examples/player/histogramwidget.cpp rename to examples/multimediawidgets/player/histogramwidget.cpp diff --git a/examples/player/histogramwidget.h b/examples/multimediawidgets/player/histogramwidget.h similarity index 100% rename from examples/player/histogramwidget.h rename to examples/multimediawidgets/player/histogramwidget.h diff --git a/examples/player/main.cpp b/examples/multimediawidgets/player/main.cpp similarity index 100% rename from examples/player/main.cpp rename to examples/multimediawidgets/player/main.cpp diff --git a/examples/player/player.cpp b/examples/multimediawidgets/player/player.cpp similarity index 100% rename from examples/player/player.cpp rename to examples/multimediawidgets/player/player.cpp diff --git a/examples/player/player.h b/examples/multimediawidgets/player/player.h similarity index 100% rename from examples/player/player.h rename to examples/multimediawidgets/player/player.h diff --git a/examples/player/player.pro b/examples/multimediawidgets/player/player.pro similarity index 66% rename from examples/player/player.pro rename to examples/multimediawidgets/player/player.pro index 2504f361..067b31b1 100644 --- a/examples/player/player.pro +++ b/examples/multimediawidgets/player/player.pro @@ -24,7 +24,5 @@ maemo* { DEFINES += PLAYER_NO_COLOROPTIONS } -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/player -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/player -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/player +INSTALLS += target diff --git a/examples/player/playercontrols.cpp b/examples/multimediawidgets/player/playercontrols.cpp similarity index 100% rename from examples/player/playercontrols.cpp rename to examples/multimediawidgets/player/playercontrols.cpp diff --git a/examples/player/playercontrols.h b/examples/multimediawidgets/player/playercontrols.h similarity index 100% rename from examples/player/playercontrols.h rename to examples/multimediawidgets/player/playercontrols.h diff --git a/examples/player/playlistmodel.cpp b/examples/multimediawidgets/player/playlistmodel.cpp similarity index 100% rename from examples/player/playlistmodel.cpp rename to examples/multimediawidgets/player/playlistmodel.cpp diff --git a/examples/player/playlistmodel.h b/examples/multimediawidgets/player/playlistmodel.h similarity index 100% rename from examples/player/playlistmodel.h rename to examples/multimediawidgets/player/playlistmodel.h diff --git a/examples/player/videowidget.cpp b/examples/multimediawidgets/player/videowidget.cpp similarity index 100% rename from examples/player/videowidget.cpp rename to examples/multimediawidgets/player/videowidget.cpp diff --git a/examples/player/videowidget.h b/examples/multimediawidgets/player/videowidget.h similarity index 100% rename from examples/player/videowidget.h rename to examples/multimediawidgets/player/videowidget.h diff --git a/examples/videographicsitem/doc/images/video-videographicsitem.png b/examples/multimediawidgets/videographicsitem/doc/images/video-videographicsitem.png similarity index 100% rename from examples/videographicsitem/doc/images/video-videographicsitem.png rename to examples/multimediawidgets/videographicsitem/doc/images/video-videographicsitem.png diff --git a/examples/videographicsitem/doc/src/videographicsitem.qdoc b/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc similarity index 100% rename from examples/videographicsitem/doc/src/videographicsitem.qdoc rename to examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc diff --git a/examples/videographicsitem/main.cpp b/examples/multimediawidgets/videographicsitem/main.cpp similarity index 100% rename from examples/videographicsitem/main.cpp rename to examples/multimediawidgets/videographicsitem/main.cpp diff --git a/examples/multimediawidgets/videographicsitem/videographicsitem.pro b/examples/multimediawidgets/videographicsitem/videographicsitem.pro new file mode 100644 index 00000000..30a9b6f2 --- /dev/null +++ b/examples/multimediawidgets/videographicsitem/videographicsitem.pro @@ -0,0 +1,14 @@ +TEMPLATE = app +TARGET = videographicsitem + +QT += multimedia multimediawidgets + +HEADERS += videoplayer.h + +SOURCES += main.cpp \ + videoplayer.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/videographicsitem +INSTALLS += target + +QT+=widgets diff --git a/examples/videographicsitem/videoplayer.cpp b/examples/multimediawidgets/videographicsitem/videoplayer.cpp similarity index 100% rename from examples/videographicsitem/videoplayer.cpp rename to examples/multimediawidgets/videographicsitem/videoplayer.cpp diff --git a/examples/videographicsitem/videoplayer.h b/examples/multimediawidgets/videographicsitem/videoplayer.h similarity index 100% rename from examples/videographicsitem/videoplayer.h rename to examples/multimediawidgets/videographicsitem/videoplayer.h diff --git a/examples/videowidget/doc/images/video-videowidget.png b/examples/multimediawidgets/videowidget/doc/images/video-videowidget.png similarity index 100% rename from examples/videowidget/doc/images/video-videowidget.png rename to examples/multimediawidgets/videowidget/doc/images/video-videowidget.png diff --git a/examples/videowidget/doc/src/videowidget.qdoc b/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc similarity index 100% rename from examples/videowidget/doc/src/videowidget.qdoc rename to examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc diff --git a/examples/videowidget/main.cpp b/examples/multimediawidgets/videowidget/main.cpp similarity index 100% rename from examples/videowidget/main.cpp rename to examples/multimediawidgets/videowidget/main.cpp diff --git a/examples/videowidget/videoplayer.cpp b/examples/multimediawidgets/videowidget/videoplayer.cpp similarity index 100% rename from examples/videowidget/videoplayer.cpp rename to examples/multimediawidgets/videowidget/videoplayer.cpp diff --git a/examples/videowidget/videoplayer.h b/examples/multimediawidgets/videowidget/videoplayer.h similarity index 100% rename from examples/videowidget/videoplayer.h rename to examples/multimediawidgets/videowidget/videoplayer.h diff --git a/examples/multimediawidgets/videowidget/videowidget.pro b/examples/multimediawidgets/videowidget/videowidget.pro new file mode 100644 index 00000000..603996b2 --- /dev/null +++ b/examples/multimediawidgets/videowidget/videowidget.pro @@ -0,0 +1,16 @@ +TEMPLATE = app +TARGET = videowidget + +QT += multimedia multimediawidgets + +HEADERS = \ + videoplayer.h + +SOURCES = \ + main.cpp \ + videoplayer.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/videowidget +INSTALLS += target + +QT+=widgets diff --git a/examples/radio/radio.pro b/examples/radio/radio.pro deleted file mode 100644 index 6931879d..00000000 --- a/examples/radio/radio.pro +++ /dev/null @@ -1,19 +0,0 @@ -TEMPLATE = app -TARGET = radio - -QT += multimedia - -HEADERS = \ - radio.h - -SOURCES = \ - main.cpp \ - radio.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/radio -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/radio - -INSTALLS += target sources - -QT+=widgets diff --git a/examples/video/video.pro b/examples/video/video.pro deleted file mode 100644 index 96d48c0d..00000000 --- a/examples/video/video.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += qmlvideo qmlvideofx - -# install -sources.files = video.pro doc snippets -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/video -INSTALLS += sources diff --git a/examples/videographicsitem/videographicsitem.pro b/examples/videographicsitem/videographicsitem.pro deleted file mode 100644 index c9038357..00000000 --- a/examples/videographicsitem/videographicsitem.pro +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE = app -TARGET = videographicsitem - -QT += multimedia multimediawidgets - -HEADERS += videoplayer.h - -SOURCES += main.cpp \ - videoplayer.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videographicsitem -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videographicsitem - -INSTALLS += target sources - -QT+=widgets diff --git a/examples/videowidget/videowidget.pro b/examples/videowidget/videowidget.pro deleted file mode 100644 index 914f48e3..00000000 --- a/examples/videowidget/videowidget.pro +++ /dev/null @@ -1,19 +0,0 @@ -TEMPLATE = app -TARGET = videowidget - -QT += multimedia multimediawidgets - -HEADERS = \ - videoplayer.h - -SOURCES = \ - main.cpp \ - videoplayer.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videowidget -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videowidget - -INSTALLS += target sources - -QT+=widgets From 945e8c9f8ed324e0a600dc97b81c3166979fcd8a Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Tue, 4 Dec 2012 10:02:22 +0100 Subject: [PATCH 04/33] Fixed build on MacOS with clang in C++11 mode. avfvideowidget.mm:120:9: error: non-constant-expression cannot be narrowed from type 'int' to 'GLfloat' (aka 'float') in initializer list [-Wc++11-narrowing] x1, y1, zValue, ^~ Change-Id: I5a08bf8b53cf029dbdfaeaa03f4babd6d49d62ad Reviewed-by: Andy Nichols Reviewed-by: Friedemann Kleint --- src/plugins/avfoundation/mediaplayer/avfvideowidget.mm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm b/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm index 30753985..a6a2f423 100644 --- a/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm +++ b/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm @@ -103,11 +103,11 @@ void AVFVideoWidget::paintGL() return; QRect targetRect = displayRect(); - int x1 = targetRect.left(); - int x2 = targetRect.right(); - int y1 = targetRect.bottom(); - int y2 = targetRect.top(); - int zValue = 0; + GLfloat x1 = targetRect.left(); + GLfloat x2 = targetRect.right(); + GLfloat y1 = targetRect.bottom(); + GLfloat y2 = targetRect.top(); + GLfloat zValue = 0; const GLfloat textureCoordinates[] = { 0, 0, From 9f10ff8e9abfa3c080203032e0efc5114826eb7b Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 5 Dec 2012 13:05:53 +0100 Subject: [PATCH 05/33] fix build for standard DirectX install paths Evaluate the environment variable DXSDK_DIR at qmake time. This makes sure, the contents get properly quoted, even if the DirectX SDK is installed into a path that contains spaces. Change-Id: Id22f56448eef4d392af77e97f46308f1b486c7c7 Reviewed-by: Oswald Buddenhagen --- src/plugins/directshow/camera/camera.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/directshow/camera/camera.pri b/src/plugins/directshow/camera/camera.pri index b576a852..91111bee 100644 --- a/src/plugins/directshow/camera/camera.pri +++ b/src/plugins/directshow/camera/camera.pri @@ -28,5 +28,5 @@ SOURCES += \ SOURCES += $$PWD/dsvideowidgetcontrol.cpp } -*-msvc*:INCLUDEPATH += $(DXSDK_DIR)/include +*-msvc*:INCLUDEPATH += $$(DXSDK_DIR)/include LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32 From 05d648833bebd243ae7c06e86c28c4e9da1531b9 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 6 Dec 2012 13:24:13 +0100 Subject: [PATCH 06/33] Doc: Fix typo and enum names Change-Id: I55a22d3a7c5fbdf2f8a16c09c701a7fa871a95e1 Reviewed-by: Jerome Pasion --- src/multimedia/qmediaobject.cpp | 2 +- src/multimedia/qmultimedia.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/multimedia/qmediaobject.cpp b/src/multimedia/qmediaobject.cpp index d1cafbf6..86f6a5df 100644 --- a/src/multimedia/qmediaobject.cpp +++ b/src/multimedia/qmediaobject.cpp @@ -423,7 +423,7 @@ void QMediaObject::setupControls() /*! \fn QMediaObject::availabilityChanged(QMultimedia::AvailabilityStatus availability) - Signal emitted when the availability of the service has changed to \a availabilty + Signal emitted when the availability of the service has changed to \a availability. */ diff --git a/src/multimedia/qmultimedia.cpp b/src/multimedia/qmultimedia.cpp index 15eda0b5..b9e09f7d 100644 --- a/src/multimedia/qmultimedia.cpp +++ b/src/multimedia/qmultimedia.cpp @@ -98,10 +98,10 @@ namespace Enumerates Service status errors. - \value NoError The service is operating correctly. - \value ServiceMissingError There is no service available to provide the requested functionality. + \value Available The service is operating correctly. + \value ServiceMissing There is no service available to provide the requested functionality. \value ResourceError The service could not allocate resources required to function correctly. - \value BusyError The service must wait for access to necessary resources. + \value Busy The service must wait for access to necessary resources. */ QT_END_NAMESPACE From a013a72434ac598c2a30c677054cae08e315265e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Wed, 5 Dec 2012 17:34:11 +0100 Subject: [PATCH 07/33] Get rid of useless requestOrientation() calls in the examples. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit requestOrientation() has no effect currently, and its intended effect was probably different from what the examples want to achieve. Change-Id: Ie3235346bd366d5f3468c605ec34394eab9417a7 Reviewed-by: Tor Arne Vestbø --- examples/multimedia/video/qmlvideo/main.cpp | 1 - examples/multimedia/video/qmlvideofx/main.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/examples/multimedia/video/qmlvideo/main.cpp b/examples/multimedia/video/qmlvideo/main.cpp index 149fc7a8..86b91482 100644 --- a/examples/multimedia/video/qmlvideo/main.cpp +++ b/examples/multimedia/video/qmlvideo/main.cpp @@ -110,7 +110,6 @@ int main(int argc, char *argv[]) QmlApplicationViewer viewer; - viewer.requestOrientation(Qt::LandscapeOrientation); viewer.setMainQmlFile(QLatin1String("qml/qmlvideo/main.qml")); QQuickItem *rootObject = viewer.rootObject(); rootObject->setProperty("source1", url1); diff --git a/examples/multimedia/video/qmlvideofx/main.cpp b/examples/multimedia/video/qmlvideofx/main.cpp index dff51776..92e476a1 100644 --- a/examples/multimedia/video/qmlvideofx/main.cpp +++ b/examples/multimedia/video/qmlvideofx/main.cpp @@ -99,7 +99,6 @@ int main(int argc, char *argv[]) QmlApplicationViewer viewer; - viewer.requestOrientation(Qt::LandscapeOrientation); viewer.setMainQmlFile(QLatin1String("qml/qmlvideofx/") + MainQmlFile); QQuickItem *rootObject = viewer.rootObject(); rootObject->setProperty("fileName", fileName); From db39db98cbd75c9b99af1f093e809a3776082b2d Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 6 Dec 2012 16:48:41 +0100 Subject: [PATCH 08/33] Update plugins.qmltypes Run with option nonrelocatable. Change-Id: I689d5d745dac9325aeb5db81484054b0dcdb9d24 Reviewed-by: Jonas Rabbe Reviewed-by: Fawzi Mohamed --- src/imports/multimedia/plugins.qmltypes | 287 ++++++------------------ 1 file changed, 63 insertions(+), 224 deletions(-) diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes index 1fe84996..b2970649 100644 --- a/src/imports/multimedia/plugins.qmltypes +++ b/src/imports/multimedia/plugins.qmltypes @@ -2,6 +2,8 @@ import QtQuick.tooling 1.1 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. +// +// This file was auto-generated with the command 'qmlplugindump -notrelocatable QtMultimedia 5.0'. Module { Component { @@ -80,65 +82,56 @@ Module { Property { name: "lockStatus"; type: "QCamera::LockStatus"; isReadonly: true } Signal { name: "stateChanged" - type: "void" Parameter { type: "QCamera::State" } } Signal { name: "captureModeChanged" - type: "void" Parameter { type: "QCamera::CaptureModes" } } Signal { name: "statusChanged" - type: "void" Parameter { type: "QCamera::Status" } } - Signal { name: "locked"; type: "void" } - Signal { name: "lockFailed"; type: "void" } + Signal { name: "locked" } + Signal { name: "lockFailed" } Signal { name: "lockStatusChanged" - type: "void" Parameter { type: "QCamera::LockStatus" } Parameter { type: "QCamera::LockChangeReason" } } Signal { name: "lockStatusChanged" - type: "void" Parameter { type: "QCamera::LockType" } Parameter { type: "QCamera::LockStatus" } Parameter { type: "QCamera::LockChangeReason" } } Signal { name: "error" - type: "void" Parameter { type: "QCamera::Error" } } Method { name: "setCaptureMode" - type: "void" Parameter { name: "mode"; type: "QCamera::CaptureModes" } } - Method { name: "load"; type: "void" } - Method { name: "unload"; type: "void" } - Method { name: "start"; type: "void" } - Method { name: "stop"; type: "void" } - Method { name: "searchAndLock"; type: "void" } - Method { name: "unlock"; type: "void" } + Method { name: "load" } + Method { name: "unload" } + Method { name: "start" } + Method { name: "stop" } + Method { name: "searchAndLock" } + Method { name: "unlock" } Method { name: "searchAndLock" - type: "void" Parameter { name: "locks"; type: "QCamera::LockTypes" } } Method { name: "unlock" - type: "void" Parameter { name: "locks"; type: "QCamera::LockTypes" } } } Component { name: "QDeclarativeAudio" prototype: "QObject" - exports: ["Audio 5.0", "MediaPlayer 5.0"] + exports: ["QtMultimedia/Audio 5.0", "QtMultimedia/MediaPlayer 5.0"] Enum { name: "Status" values: { @@ -194,12 +187,12 @@ Module { Property { name: "autoLoad"; type: "bool" } Property { name: "status"; type: "Status"; isReadonly: true } Property { name: "duration"; type: "int"; isReadonly: true } - Property { name: "position"; type: "int" } + Property { name: "position"; type: "int"; isReadonly: true } Property { name: "volume"; type: "double" } Property { name: "muted"; type: "bool" } Property { name: "hasAudio"; type: "bool"; isReadonly: true } Property { name: "hasVideo"; type: "bool"; isReadonly: true } - Property { name: "bufferProgress"; type: "int"; isReadonly: true } + Property { name: "bufferProgress"; type: "double"; isReadonly: true } Property { name: "seekable"; type: "bool"; isReadonly: true } Property { name: "playbackRate"; type: "double" } Property { name: "error"; type: "Error"; isReadonly: true } @@ -212,45 +205,31 @@ Module { } Property { name: "mediaObject"; type: "QObject"; isReadonly: true; isPointer: true } Property { name: "availability"; type: "Availability"; isReadonly: true } - Signal { name: "sourceChanged"; type: "void" } - Signal { name: "autoLoadChanged"; type: "void" } - Signal { name: "loopCountChanged"; type: "void" } - Signal { name: "playbackStateChanged"; type: "void" } - Signal { name: "autoPlayChanged"; type: "void" } - Signal { name: "paused"; type: "void" } - Signal { name: "stopped"; type: "void" } - Signal { name: "playing"; type: "void" } - Signal { name: "statusChanged"; type: "void" } - Signal { name: "durationChanged"; type: "void" } - Signal { name: "positionChanged"; type: "void" } - Signal { name: "volumeChanged"; type: "void" } - Signal { name: "mutedChanged"; type: "void" } - Signal { name: "hasAudioChanged"; type: "void" } - Signal { name: "hasVideoChanged"; type: "void" } - Signal { name: "bufferProgressChanged"; type: "void" } - Signal { name: "seekableChanged"; type: "void" } - Signal { name: "playbackRateChanged"; type: "void" } + Signal { name: "loopCountChanged" } + Signal { name: "paused" } + Signal { name: "stopped" } + Signal { name: "playing" } Signal { name: "availabilityChanged" - type: "void" Parameter { name: "availability"; type: "Availability" } } - Signal { name: "errorChanged"; type: "void" } Signal { name: "error" - type: "void" Parameter { name: "error"; type: "QDeclarativeAudio::Error" } Parameter { name: "errorString"; type: "string" } } - Signal { name: "mediaObjectChanged"; type: "void" } - Method { name: "play"; type: "void" } - Method { name: "pause"; type: "void" } - Method { name: "stop"; type: "void" } + Method { name: "play" } + Method { name: "pause" } + Method { name: "stop" } + Method { + name: "seek" + Parameter { name: "position"; type: "int" } + } } Component { name: "QDeclarativeCamera" prototype: "QObject" - exports: ["Camera 5.0"] + exports: ["QtMultimedia/Camera 5.0"] Enum { name: "CaptureMode" values: { @@ -414,118 +393,96 @@ Module { isReadonly: true isPointer: true } - Signal { name: "errorChanged"; type: "void" } + Signal { name: "errorChanged" } Signal { name: "error" - type: "void" Parameter { name: "errorCode"; type: "QDeclarativeCamera::Error" } Parameter { name: "errorString"; type: "string" } } - Signal { name: "captureModeChanged"; type: "void" } Signal { name: "cameraStateChanged" - type: "void" Parameter { type: "QDeclarativeCamera::State" } } - Signal { name: "cameraStatusChanged"; type: "void" } - Signal { name: "lockStatusChanged"; type: "void" } Signal { name: "opticalZoomChanged" - type: "void" Parameter { type: "double" } } Signal { name: "digitalZoomChanged" - type: "void" Parameter { type: "double" } } Signal { name: "maximumOpticalZoomChanged" - type: "void" Parameter { type: "double" } } Signal { name: "maximumDigitalZoomChanged" - type: "void" Parameter { type: "double" } } - Signal { name: "mediaObjectChanged"; type: "void" } Signal { name: "availabilityChanged" - type: "void" Parameter { name: "availability"; type: "Availability" } } Method { name: "setCaptureMode" - type: "void" Parameter { name: "mode"; type: "CaptureMode" } } - Method { name: "start"; type: "void" } - Method { name: "stop"; type: "void" } + Method { name: "start" } + Method { name: "stop" } Method { name: "setCameraState" - type: "void" Parameter { name: "state"; type: "State" } } - Method { name: "searchAndLock"; type: "void" } - Method { name: "unlock"; type: "void" } + Method { name: "searchAndLock" } + Method { name: "unlock" } Method { name: "setOpticalZoom" - type: "void" Parameter { type: "double" } } Method { name: "setDigitalZoom" - type: "void" Parameter { type: "double" } } } Component { name: "QDeclarativeCameraCapture" prototype: "QObject" - exports: ["CameraCapture 5.0"] + exports: ["QtMultimedia/CameraCapture 5.0"] Property { name: "ready"; type: "bool"; isReadonly: true } Property { name: "capturedImagePath"; type: "string"; isReadonly: true } Property { name: "resolution"; type: "QSize" } Property { name: "errorString"; type: "string"; isReadonly: true } Signal { name: "readyForCaptureChanged" - type: "void" Parameter { type: "bool" } } Signal { name: "imageExposed" - type: "void" Parameter { name: "requestId"; type: "int" } } Signal { name: "imageCaptured" - type: "void" Parameter { name: "requestId"; type: "int" } Parameter { name: "preview"; type: "string" } } Signal { name: "imageMetadataAvailable" - type: "void" Parameter { name: "requestId"; type: "int" } Parameter { name: "key"; type: "string" } Parameter { name: "value"; type: "QVariant" } } Signal { name: "imageSaved" - type: "void" Parameter { name: "requestId"; type: "int" } Parameter { name: "path"; type: "string" } } Signal { name: "captureFailed" - type: "void" Parameter { name: "requestId"; type: "int" } Parameter { name: "message"; type: "string" } } Signal { name: "resolutionChanged" - type: "void" Parameter { type: "QSize" } } Method { name: "capture"; type: "int" } @@ -534,15 +491,13 @@ Module { type: "int" Parameter { name: "location"; type: "string" } } - Method { name: "cancelCapture"; type: "void" } + Method { name: "cancelCapture" } Method { name: "setResolution" - type: "void" Parameter { name: "resolution"; type: "QSize" } } Method { name: "setMetadata" - type: "void" Parameter { name: "key"; type: "string" } Parameter { name: "value"; type: "QVariant" } } @@ -550,7 +505,7 @@ Module { Component { name: "QDeclarativeCameraExposure" prototype: "QObject" - exports: ["CameraExposure 5.0"] + exports: ["QtMultimedia/CameraExposure 5.0"] Property { name: "exposureCompensation"; type: "double" } Property { name: "iso"; type: "int"; isReadonly: true } Property { name: "shutterSpeed"; type: "double"; isReadonly: true } @@ -563,141 +518,117 @@ Module { Property { name: "meteringMode"; type: "QDeclarativeCamera::MeteringMode" } Signal { name: "isoSensitivityChanged" - type: "void" Parameter { type: "int" } } Signal { name: "apertureChanged" - type: "void" Parameter { type: "double" } } Signal { name: "shutterSpeedChanged" - type: "void" Parameter { type: "double" } } Signal { name: "manualIsoSensitivityChanged" - type: "void" Parameter { type: "int" } } Signal { name: "manualApertureChanged" - type: "void" Parameter { type: "double" } } Signal { name: "manualShutterSpeedChanged" - type: "void" Parameter { type: "double" } } Signal { name: "exposureCompensationChanged" - type: "void" Parameter { type: "double" } } Signal { name: "exposureModeChanged" - type: "void" Parameter { type: "QDeclarativeCamera::ExposureMode" } } Signal { name: "meteringModeChanged" - type: "void" Parameter { type: "QDeclarativeCamera::MeteringMode" } } Signal { name: "spotMeteringPointChanged" - type: "void" Parameter { type: "QPointF" } } Method { name: "setExposureMode" - type: "void" Parameter { type: "QDeclarativeCamera::ExposureMode" } } Method { name: "setExposureCompensation" - type: "void" Parameter { name: "ev"; type: "double" } } Method { name: "setManualAperture" - type: "void" Parameter { type: "double" } } Method { name: "setManualShutterSpeed" - type: "void" Parameter { type: "double" } } Method { name: "setManualIsoSensitivity" - type: "void" Parameter { name: "iso"; type: "int" } } - Method { name: "setAutoAperture"; type: "void" } - Method { name: "setAutoShutterSpeed"; type: "void" } - Method { name: "setAutoIsoSensitivity"; type: "void" } + Method { name: "setAutoAperture" } + Method { name: "setAutoShutterSpeed" } + Method { name: "setAutoIsoSensitivity" } } Component { name: "QDeclarativeCameraFlash" prototype: "QObject" - exports: ["CameraFlash 5.0"] + exports: ["QtMultimedia/CameraFlash 5.0"] Property { name: "ready"; type: "bool"; isReadonly: true } Property { name: "mode"; type: "int" } Signal { name: "flashReady" - type: "void" Parameter { name: "status"; type: "bool" } } Signal { name: "flashModeChanged" - type: "void" Parameter { type: "int" } } Method { name: "setFlashMode" - type: "void" Parameter { type: "int" } } } Component { name: "QDeclarativeCameraFocus" prototype: "QObject" - exports: ["CameraFocus 5.0"] + exports: ["QtMultimedia/CameraFocus 5.0"] Property { name: "focusMode"; type: "QDeclarativeCamera::FocusMode" } Property { name: "focusPointMode"; type: "QDeclarativeCamera::FocusPointMode" } Property { name: "customFocusPoint"; type: "QPointF" } Property { name: "focusZones"; type: "QObject"; isReadonly: true; isPointer: true } Signal { name: "focusModeChanged" - type: "void" Parameter { type: "QDeclarativeCamera::FocusMode" } } Signal { name: "focusPointModeChanged" - type: "void" Parameter { type: "QDeclarativeCamera::FocusPointMode" } } Signal { name: "customFocusPointChanged" - type: "void" Parameter { type: "QPointF" } } Method { name: "setFocusMode" - type: "void" Parameter { type: "QDeclarativeCamera::FocusMode" } } Method { name: "setFocusPointMode" - type: "void" Parameter { name: "mode"; type: "QDeclarativeCamera::FocusPointMode" } } Method { name: "setCustomFocusPoint" - type: "void" Parameter { name: "point"; type: "QPointF" } } Method { @@ -714,7 +645,7 @@ Module { Component { name: "QDeclarativeCameraImageProcessing" prototype: "QObject" - exports: ["CameraImageProcessing 5.0"] + exports: ["QtMultimedia/CameraImageProcessing 5.0"] Enum { name: "WhiteBalanceMode" values: { @@ -738,69 +669,57 @@ Module { Property { name: "denoisingLevel"; type: "double" } Signal { name: "whiteBalanceModeChanged" - type: "void" Parameter { type: "QDeclarativeCameraImageProcessing::WhiteBalanceMode" } } Signal { name: "manualWhiteBalanceChanged" - type: "void" Parameter { type: "double" } } Signal { name: "contrastChanged" - type: "void" Parameter { type: "double" } } Signal { name: "saturationChanged" - type: "void" Parameter { type: "double" } } Signal { name: "sharpeningLevelChanged" - type: "void" Parameter { type: "double" } } Signal { name: "denoisingLevelChanged" - type: "void" Parameter { type: "double" } } Method { name: "setWhiteBalanceMode" - type: "void" Parameter { name: "mode"; type: "QDeclarativeCameraImageProcessing::WhiteBalanceMode" } } Method { name: "setManualWhiteBalance" - type: "void" Parameter { name: "colorTemp"; type: "double" } } Method { name: "setContrast" - type: "void" Parameter { name: "value"; type: "double" } } Method { name: "setSaturation" - type: "void" Parameter { name: "value"; type: "double" } } Method { name: "setSharpeningLevel" - type: "void" Parameter { name: "value"; type: "double" } } Method { name: "setDenoisingLevel" - type: "void" Parameter { name: "value"; type: "double" } } } Component { name: "QDeclarativeCameraRecorder" prototype: "QObject" - exports: ["CameraRecorder 5.0"] + exports: ["QtMultimedia/CameraRecorder 5.0"] Enum { name: "RecorderState" values: { @@ -859,180 +778,146 @@ Module { Property { name: "errorCode"; type: "string"; isReadonly: true } Signal { name: "recorderStateChanged" - type: "void" Parameter { name: "state"; type: "QDeclarativeCameraRecorder::RecorderState" } } - Signal { name: "recorderStatusChanged"; type: "void" } Signal { name: "durationChanged" - type: "void" Parameter { name: "duration"; type: "qlonglong" } } Signal { name: "mutedChanged" - type: "void" Parameter { name: "muted"; type: "bool" } } Signal { name: "outputLocationChanged" - type: "void" Parameter { name: "location"; type: "string" } } Signal { name: "actualLocationChanged" - type: "void" Parameter { name: "location"; type: "string" } } Signal { name: "error" - type: "void" Parameter { name: "errorCode"; type: "QDeclarativeCameraRecorder::Error" } Parameter { name: "errorString"; type: "string" } } Signal { name: "metaDataChanged" - type: "void" Parameter { name: "key"; type: "string" } Parameter { name: "value"; type: "QVariant" } } Signal { name: "captureResolutionChanged" - type: "void" Parameter { type: "QSize" } } Signal { name: "audioCodecChanged" - type: "void" Parameter { name: "codec"; type: "string" } } Signal { name: "videoCodecChanged" - type: "void" Parameter { name: "codec"; type: "string" } } Signal { name: "mediaContainerChanged" - type: "void" Parameter { name: "container"; type: "string" } } Signal { name: "frameRateChanged" - type: "void" Parameter { name: "arg"; type: "double" } } Signal { name: "videoBitRateChanged" - type: "void" Parameter { name: "arg"; type: "int" } } Signal { name: "audioBitRateChanged" - type: "void" Parameter { name: "arg"; type: "int" } } Signal { name: "audioChannelsChanged" - type: "void" Parameter { name: "arg"; type: "int" } } Signal { name: "audioSampleRateChanged" - type: "void" Parameter { name: "arg"; type: "int" } } Signal { name: "audioEncodingModeChanged" - type: "void" Parameter { name: "encodingMode"; type: "EncodingMode" } } Signal { name: "videoEncodingModeChanged" - type: "void" Parameter { name: "encodingMode"; type: "EncodingMode" } } Method { name: "setOutputLocation" - type: "void" Parameter { name: "location"; type: "string" } } - Method { name: "record"; type: "void" } - Method { name: "stop"; type: "void" } + Method { name: "record" } + Method { name: "stop" } Method { name: "setRecorderState" - type: "void" Parameter { name: "state"; type: "QDeclarativeCameraRecorder::RecorderState" } } Method { name: "setMuted" - type: "void" Parameter { name: "muted"; type: "bool" } } Method { name: "setMetadata" - type: "void" Parameter { name: "key"; type: "string" } Parameter { name: "value"; type: "QVariant" } } Method { name: "setCaptureResolution" - type: "void" Parameter { name: "resolution"; type: "QSize" } } Method { name: "setAudioCodec" - type: "void" Parameter { name: "codec"; type: "string" } } Method { name: "setVideoCodec" - type: "void" Parameter { name: "codec"; type: "string" } } Method { name: "setMediaContainer" - type: "void" Parameter { name: "container"; type: "string" } } Method { name: "setFrameRate" - type: "void" Parameter { name: "frameRate"; type: "double" } } Method { name: "setVideoBitRate" - type: "void" Parameter { name: "rate"; type: "int" } } Method { name: "setAudioBitRate" - type: "void" Parameter { name: "rate"; type: "int" } } Method { name: "setAudioChannels" - type: "void" Parameter { name: "channels"; type: "int" } } Method { name: "setAudioSampleRate" - type: "void" Parameter { name: "rate"; type: "int" } } Method { name: "setVideoEncodingMode" - type: "void" Parameter { name: "encodingMode"; type: "EncodingMode" } } Method { name: "setAudioEncodingMode" - type: "void" Parameter { name: "encodingMode"; type: "EncodingMode" } } } Component { name: "QDeclarativeRadio" prototype: "QObject" - exports: ["Radio 5.0"] + exports: ["QtMultimedia/Radio 5.0"] Enum { name: "State" values: { @@ -1100,110 +985,92 @@ Module { Property { name: "radioData"; type: "QDeclarativeRadioData"; isReadonly: true; isPointer: true } Signal { name: "stateChanged" - type: "void" Parameter { name: "state"; type: "QDeclarativeRadio::State" } } Signal { name: "bandChanged" - type: "void" Parameter { name: "band"; type: "QDeclarativeRadio::Band" } } Signal { name: "frequencyChanged" - type: "void" Parameter { name: "frequency"; type: "int" } } Signal { name: "stereoStatusChanged" - type: "void" Parameter { name: "stereo"; type: "bool" } } Signal { name: "searchingChanged" - type: "void" Parameter { name: "searching"; type: "bool" } } Signal { name: "signalStrengthChanged" - type: "void" Parameter { name: "signalStrength"; type: "int" } } Signal { name: "volumeChanged" - type: "void" Parameter { name: "volume"; type: "int" } } Signal { name: "mutedChanged" - type: "void" Parameter { name: "muted"; type: "bool" } } Signal { name: "stationFound" - type: "void" Parameter { name: "frequency"; type: "int" } Parameter { name: "stationId"; type: "string" } } Signal { name: "antennaConnectedChanged" - type: "void" Parameter { name: "connectionStatus"; type: "bool" } } Signal { name: "availabilityChanged" - type: "void" Parameter { name: "availability"; type: "Availability" } } - Signal { name: "errorChanged"; type: "void" } + Signal { name: "errorChanged" } Signal { name: "error" - type: "void" Parameter { name: "errorCode"; type: "QDeclarativeRadio::Error" } } Method { name: "setBand" - type: "void" Parameter { name: "band"; type: "QDeclarativeRadio::Band" } } Method { name: "setFrequency" - type: "void" Parameter { name: "frequency"; type: "int" } } Method { name: "setStereoMode" - type: "void" Parameter { name: "stereoMode"; type: "QDeclarativeRadio::StereoMode" } } Method { name: "setVolume" - type: "void" Parameter { name: "volume"; type: "int" } } Method { name: "setMuted" - type: "void" Parameter { name: "muted"; type: "bool" } } - Method { name: "cancelScan"; type: "void" } - Method { name: "scanDown"; type: "void" } - Method { name: "scanUp"; type: "void" } - Method { name: "tuneUp"; type: "void" } - Method { name: "tuneDown"; type: "void" } + Method { name: "cancelScan" } + Method { name: "scanDown" } + Method { name: "scanUp" } + Method { name: "tuneUp" } + Method { name: "tuneDown" } Method { name: "searchAllStations" - type: "void" Parameter { name: "searchMode"; type: "QDeclarativeRadio::SearchMode" } } - Method { name: "searchAllStations"; type: "void" } - Method { name: "start"; type: "void" } - Method { name: "stop"; type: "void" } + Method { name: "searchAllStations" } + Method { name: "start" } + Method { name: "stop" } Method { name: "isAvailable"; type: "bool" } } Component { name: "QDeclarativeRadioData" prototype: "QObject" - exports: ["RadioData 5.0"] + exports: ["QtMultimedia/RadioData 5.0"] Enum { name: "Error" values: { @@ -1284,48 +1151,39 @@ Module { Property { name: "availability"; type: "Availability"; isReadonly: true } Signal { name: "stationIdChanged" - type: "void" Parameter { name: "stationId"; type: "string" } } Signal { name: "programTypeChanged" - type: "void" Parameter { name: "programType"; type: "QDeclarativeRadioData::ProgramType" } } Signal { name: "programTypeNameChanged" - type: "void" Parameter { name: "programTypeName"; type: "string" } } Signal { name: "stationNameChanged" - type: "void" Parameter { name: "stationName"; type: "string" } } Signal { name: "radioTextChanged" - type: "void" Parameter { name: "radioText"; type: "string" } } Signal { name: "alternativeFrequenciesEnabledChanged" - type: "void" Parameter { name: "enabled"; type: "bool" } } Signal { name: "availabilityChanged" - type: "void" Parameter { name: "availability"; type: "Availability" } } - Signal { name: "errorChanged"; type: "void" } + Signal { name: "errorChanged" } Signal { name: "error" - type: "void" Parameter { name: "errorCode"; type: "QDeclarativeRadioData::Error" } } Method { name: "setAlternativeFrequenciesEnabled" - type: "void" Parameter { name: "enabled"; type: "bool" } } Method { name: "isAvailable"; type: "bool" } @@ -1333,17 +1191,15 @@ Module { Component { name: "QDeclarativeTorch" prototype: "QObject" - exports: ["Torch 5.0"] + exports: ["QtMultimedia/Torch 5.0"] Property { name: "enabled"; type: "bool" } Property { name: "power"; type: "int" } - Signal { name: "enabledChanged"; type: "void" } - Signal { name: "powerChanged"; type: "void" } } Component { name: "QDeclarativeVideoOutput" defaultProperty: "data" prototype: "QQuickItem" - exports: ["VideoOutput 5.0"] + exports: ["QtMultimedia/VideoOutput 5.0"] Enum { name: "FillMode" values: { @@ -1357,15 +1213,10 @@ Module { Property { name: "orientation"; type: "int" } Property { name: "sourceRect"; type: "QRectF"; isReadonly: true } Property { name: "contentRect"; type: "QRectF"; isReadonly: true } - Signal { name: "sourceChanged"; type: "void" } Signal { name: "fillModeChanged" - type: "void" Parameter { type: "QDeclarativeVideoOutput::FillMode" } } - Signal { name: "orientationChanged"; type: "void" } - Signal { name: "sourceRectChanged"; type: "void" } - Signal { name: "contentRectChanged"; type: "void" } Method { name: "mapPointToItem" type: "QPointF" @@ -1413,36 +1264,31 @@ Module { Property { name: "notifyInterval"; type: "int" } Signal { name: "notifyIntervalChanged" - type: "void" Parameter { name: "milliSeconds"; type: "int" } } Signal { name: "metaDataAvailableChanged" - type: "void" Parameter { name: "available"; type: "bool" } } - Signal { name: "metaDataChanged"; type: "void" } + Signal { name: "metaDataChanged" } Signal { name: "metaDataChanged" - type: "void" Parameter { name: "key"; type: "string" } Parameter { name: "value"; type: "QVariant" } } Signal { name: "availabilityChanged" - type: "void" Parameter { name: "available"; type: "bool" } } Signal { name: "availabilityChanged" - type: "void" - Parameter { name: "error"; type: "QMultimedia::AvailabilityStatus" } + Parameter { name: "availability"; type: "QMultimedia::AvailabilityStatus" } } } Component { name: "QSoundEffect" prototype: "QObject" - exports: ["SoundEffect 5.0"] + exports: ["QtMultimedia/SoundEffect 5.0"] Enum { name: "Loop" values: { @@ -1466,16 +1312,9 @@ Module { Property { name: "playing"; type: "bool"; isReadonly: true } Property { name: "status"; type: "Status"; isReadonly: true } Property { name: "category"; type: "string" } - Signal { name: "sourceChanged"; type: "void" } - Signal { name: "loopCountChanged"; type: "void" } - Signal { name: "loopsRemainingChanged"; type: "void" } - Signal { name: "volumeChanged"; type: "void" } - Signal { name: "mutedChanged"; type: "void" } - Signal { name: "loadedChanged"; type: "void" } - Signal { name: "playingChanged"; type: "void" } - Signal { name: "statusChanged"; type: "void" } - Signal { name: "categoryChanged"; type: "void" } - Method { name: "play"; type: "void" } - Method { name: "stop"; type: "void" } + Signal { name: "loopCountChanged" } + Signal { name: "loadedChanged" } + Method { name: "play" } + Method { name: "stop" } } } From 31fdbb1c22a06fc41f3df10e5959c66f59634986 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Thu, 6 Dec 2012 14:01:23 +0100 Subject: [PATCH 09/33] Fix includes to build on case-sensitive filesystem Change-Id: Ibd355256a5d2a60ee3a61ba2a2bf9f0f63c591cb Reviewed-by: Jonas Rabbe Reviewed-by: Lars Knoll --- src/plugins/qt7/qt7movierenderer.mm | 2 +- src/plugins/qt7/qt7movieviewoutput.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qt7/qt7movierenderer.mm b/src/plugins/qt7/qt7movierenderer.mm index f1508294..a55c44b1 100644 --- a/src/plugins/qt7/qt7movierenderer.mm +++ b/src/plugins/qt7/qt7movierenderer.mm @@ -55,7 +55,7 @@ #include #include -#include +#include QT_USE_NAMESPACE diff --git a/src/plugins/qt7/qt7movieviewoutput.mm b/src/plugins/qt7/qt7movieviewoutput.mm index 9600872b..a65fd24e 100644 --- a/src/plugins/qt7/qt7movieviewoutput.mm +++ b/src/plugins/qt7/qt7movieviewoutput.mm @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#import +#import #include "qt7backend.h" From ad835347361c16b662f73680cbaa0444c1ec4064 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Thu, 6 Dec 2012 15:42:47 +0100 Subject: [PATCH 10/33] WMF: Fixed shutdown sequence. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A wrong shutdown sequence was causing a wait condition to never be met, resulting in a 5 seconds hang on shutdown. Also reduced the wait condition timeout to 100 ms. Task-number: QTBUG-28432 Change-Id: Ib415bf66634603d839be3e34e497e3a3c5a19ad9 Reviewed-by: Samuel Rødal Reviewed-by: Jason Barron --- src/plugins/wmf/player/mfplayerservice.cpp | 3 ++- src/plugins/wmf/player/mfplayersession.cpp | 2 +- src/plugins/wmf/wmfserviceplugin.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/wmf/player/mfplayerservice.cpp b/src/plugins/wmf/player/mfplayerservice.cpp index 2ca74ad3..5bda9f98 100644 --- a/src/plugins/wmf/player/mfplayerservice.cpp +++ b/src/plugins/wmf/player/mfplayerservice.cpp @@ -71,6 +71,8 @@ MFPlayerService::MFPlayerService(QObject *parent) MFPlayerService::~MFPlayerService() { + m_session->close(); + #ifndef Q_WS_SIMULATOR if (m_videoWindowControl) delete m_videoWindowControl; @@ -79,7 +81,6 @@ MFPlayerService::~MFPlayerService() if (m_videoRendererControl) delete m_videoRendererControl; - m_session->close(); m_session->Release(); } diff --git a/src/plugins/wmf/player/mfplayersession.cpp b/src/plugins/wmf/player/mfplayersession.cpp index e9c40567..15095866 100644 --- a/src/plugins/wmf/player/mfplayersession.cpp +++ b/src/plugins/wmf/player/mfplayersession.cpp @@ -454,7 +454,7 @@ void MFPlayerSession::close() if (m_session) { hr = m_session->Close(); if (SUCCEEDED(hr)) { - DWORD dwWaitResult = WaitForSingleObject(m_hCloseEvent, 5000); + DWORD dwWaitResult = WaitForSingleObject(m_hCloseEvent, 100); if (dwWaitResult == WAIT_TIMEOUT) { qWarning() << "session close time out!"; } diff --git a/src/plugins/wmf/wmfserviceplugin.cpp b/src/plugins/wmf/wmfserviceplugin.cpp index 9d1a359d..8cff66f3 100644 --- a/src/plugins/wmf/wmfserviceplugin.cpp +++ b/src/plugins/wmf/wmfserviceplugin.cpp @@ -92,8 +92,8 @@ QMediaService* WMFServicePlugin::create(QString const& key) void WMFServicePlugin::release(QMediaService *service) { - releaseRefCount(); delete service; + releaseRefCount(); } QMediaServiceProviderHint::Features WMFServicePlugin::supportedFeatures( From 06b63e99e4b86db1fbbed154316ada1dc7385ad3 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Thu, 6 Dec 2012 16:00:06 +0100 Subject: [PATCH 11/33] WMF: Recreate the MFMediaSession when loading a new media. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MFMediaSession doesn't seem to handle correctly the change of media source, causing the playback not to work afterwards. A single MFMediaSession was created and used for every loaded media, we now create a new one whenever we load a new media (releasing the old one beforehand). Task-number: QTBUG-26819 Change-Id: Id99c9dd54e161823d9580933e063f16240806529 Reviewed-by: Samuel Rødal Reviewed-by: Jason Barron --- .../wmf/player/evr9videowindowcontrol.cpp | 54 ++++++++++------ .../wmf/player/evr9videowindowcontrol.h | 6 +- .../wmf/player/mfaudioendpointcontrol.cpp | 17 +++++- .../wmf/player/mfaudioendpointcontrol.h | 3 +- src/plugins/wmf/player/mfplayersession.cpp | 61 ++++++++++++++----- src/plugins/wmf/player/mfplayersession.h | 1 + .../wmf/player/mfvideorenderercontrol.cpp | 34 ++++++++--- .../wmf/player/mfvideorenderercontrol.h | 4 +- 8 files changed, 133 insertions(+), 47 deletions(-) diff --git a/src/plugins/wmf/player/evr9videowindowcontrol.cpp b/src/plugins/wmf/player/evr9videowindowcontrol.cpp index 0a50114d..7f1c7133 100644 --- a/src/plugins/wmf/player/evr9videowindowcontrol.cpp +++ b/src/plugins/wmf/player/evr9videowindowcontrol.cpp @@ -57,26 +57,16 @@ Evr9VideoWindowControl::Evr9VideoWindowControl(QObject *parent) , m_currentActivate(0) , m_evrSink(0) , m_displayControl(0) + , m_processor(0) { - if (FAILED(MFCreateVideoRendererActivate(0, &m_currentActivate))) { - qWarning() << "Failed to create evr video renderer activate!"; - return; - } - if (FAILED(m_currentActivate->ActivateObject(IID_IMFMediaSink, (LPVOID*)(&m_evrSink)))) { - qWarning() << "Failed to activate evr media sink!"; - return; - } - if (FAILED(MFGetService(m_evrSink, MR_VIDEO_RENDER_SERVICE, IID_PPV_ARGS(&m_displayControl)))) { - qWarning() << "Failed to get display control from evr media sink!"; - return; - } - if (FAILED(MFGetService(m_evrSink, MR_VIDEO_MIXER_SERVICE, IID_PPV_ARGS(&m_processor)))) { - qWarning() << "Failed to get video processor from evr media sink!"; - return; - } } Evr9VideoWindowControl::~Evr9VideoWindowControl() +{ + clear(); +} + +void Evr9VideoWindowControl::clear() { if (m_processor) m_processor->Release(); @@ -88,8 +78,12 @@ Evr9VideoWindowControl::~Evr9VideoWindowControl() m_currentActivate->ShutdownObject(); m_currentActivate->Release(); } -} + m_processor = NULL; + m_displayControl = NULL; + m_evrSink = NULL; + m_currentActivate = NULL; +} WId Evr9VideoWindowControl::winId() const { @@ -307,8 +301,32 @@ void Evr9VideoWindowControl::setSaturation(int saturation) emit saturationChanged(saturation); } -IMFActivate* Evr9VideoWindowControl::currentActivate() const +IMFActivate* Evr9VideoWindowControl::createActivate() { + clear(); + + if (FAILED(MFCreateVideoRendererActivate(0, &m_currentActivate))) { + qWarning() << "Failed to create evr video renderer activate!"; + return 0; + } + if (FAILED(m_currentActivate->ActivateObject(IID_IMFMediaSink, (LPVOID*)(&m_evrSink)))) { + qWarning() << "Failed to activate evr media sink!"; + return 0; + } + if (FAILED(MFGetService(m_evrSink, MR_VIDEO_RENDER_SERVICE, IID_PPV_ARGS(&m_displayControl)))) { + qWarning() << "Failed to get display control from evr media sink!"; + return 0; + } + if (FAILED(MFGetService(m_evrSink, MR_VIDEO_MIXER_SERVICE, IID_PPV_ARGS(&m_processor)))) { + qWarning() << "Failed to get video processor from evr media sink!"; + return 0; + } + + setWinId(m_windowId); + setDisplayRect(m_displayRect); + setAspectRatioMode(m_aspectRatioMode); + m_dirtyValues = DXVA2_ProcAmp_Brightness | DXVA2_ProcAmp_Contrast | DXVA2_ProcAmp_Hue | DXVA2_ProcAmp_Saturation; + return m_currentActivate; } diff --git a/src/plugins/wmf/player/evr9videowindowcontrol.h b/src/plugins/wmf/player/evr9videowindowcontrol.h index d64447fd..ea4bae56 100644 --- a/src/plugins/wmf/player/evr9videowindowcontrol.h +++ b/src/plugins/wmf/player/evr9videowindowcontrol.h @@ -85,10 +85,12 @@ public: int saturation() const; void setSaturation(int saturation); - IMFActivate* currentActivate() const; + IMFActivate* createActivate(); + + void setProcAmpValues(); private: - void setProcAmpValues(); + void clear(); DXVA2_Fixed32 scaleProcAmpValue(DWORD prop, int value) const; WId m_windowId; diff --git a/src/plugins/wmf/player/mfaudioendpointcontrol.cpp b/src/plugins/wmf/player/mfaudioendpointcontrol.cpp index 6d421fd0..7639f4f9 100644 --- a/src/plugins/wmf/player/mfaudioendpointcontrol.cpp +++ b/src/plugins/wmf/player/mfaudioendpointcontrol.cpp @@ -46,17 +46,23 @@ MFAudioEndpointControl::MFAudioEndpointControl(QObject *parent) : QAudioOutputSelectorControl(parent) , m_currentActivate(0) { - updateEndpoints(); - setActiveOutput(m_defaultEndpoint); } MFAudioEndpointControl::~MFAudioEndpointControl() { + clear(); +} + +void MFAudioEndpointControl::clear() +{ + m_activeEndpoint.clear(); + foreach (LPWSTR wstrID, m_devices) CoTaskMemFree(wstrID); if (m_currentActivate) m_currentActivate->Release(); + m_currentActivate = NULL; } QList MFAudioEndpointControl::availableOutputs() const @@ -119,8 +125,13 @@ void MFAudioEndpointControl::setActiveOutput(const QString &name) m_activeEndpoint = name; } -IMFActivate* MFAudioEndpointControl::currentActivate() const +IMFActivate* MFAudioEndpointControl::createActivate() { + clear(); + + updateEndpoints(); + setActiveOutput(m_defaultEndpoint); + return m_currentActivate; } diff --git a/src/plugins/wmf/player/mfaudioendpointcontrol.h b/src/plugins/wmf/player/mfaudioendpointcontrol.h index 1e7fc58b..53c6657c 100644 --- a/src/plugins/wmf/player/mfaudioendpointcontrol.h +++ b/src/plugins/wmf/player/mfaudioendpointcontrol.h @@ -68,9 +68,10 @@ public: void setActiveOutput(const QString& name); - IMFActivate* currentActivate() const; + IMFActivate* createActivate(); private: + void clear(); void updateEndpoints(); QString m_defaultEndpoint; diff --git a/src/plugins/wmf/player/mfplayersession.cpp b/src/plugins/wmf/player/mfplayersession.cpp index 15095866..7b35af43 100644 --- a/src/plugins/wmf/player/mfplayersession.cpp +++ b/src/plugins/wmf/player/mfplayersession.cpp @@ -411,6 +411,7 @@ MFPlayerSession::MFPlayerSession(MFPlayerService *playerService) , m_volumeControl(0) , m_netsourceStatistics(0) , m_hCloseEvent(0) + , m_closing(false) , m_pendingRate(1) , m_volume(1) , m_muted(false) @@ -422,10 +423,6 @@ MFPlayerSession::MFPlayerSession(MFPlayerService *playerService) , m_audioSampleGrabberNode(0) , m_videoProbeMFT(0) { - m_hCloseEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - m_sourceResolver = new SourceResolver(); - QObject::connect(m_sourceResolver, SIGNAL(mediaSourceReady()), this, SLOT(handleMediaSourceReady())); - QObject::connect(m_sourceResolver, SIGNAL(error(long)), this, SLOT(handleSourceError(long))); QObject::connect(this, SIGNAL(sessionEvent(IMFMediaEvent *)), this, SLOT(handleSessionEvent(IMFMediaEvent *))); m_pendingState = NoPending; @@ -438,20 +435,23 @@ MFPlayerSession::MFPlayerSession(MFPlayerService *playerService) m_request.prevCmd = CmdNone; m_request.rate = 1.0f; - createSession(); - PropVariantInit(&m_varStart); - m_varStart.vt = VT_I8; - m_varStart.uhVal.QuadPart = 0; - m_audioSampleGrabber = new AudioSampleGrabberCallback; m_videoProbeMFT = new MFTransform; } void MFPlayerSession::close() { +#ifdef DEBUG_MEDIAFOUNDATION + qDebug() << "close"; +#endif + clear(); + if (!m_session) + return; + HRESULT hr = S_OK; if (m_session) { + m_closing = true; hr = m_session->Close(); if (SUCCEEDED(hr)) { DWORD dwWaitResult = WaitForSingleObject(m_hCloseEvent, 100); @@ -459,6 +459,7 @@ void MFPlayerSession::close() qWarning() << "session close time out!"; } } + m_closing = false; } if (SUCCEEDED(hr)) { @@ -475,7 +476,9 @@ void MFPlayerSession::close() if (m_session) m_session->Release(); m_session = 0; - CloseHandle(m_hCloseEvent); + if (m_hCloseEvent) + CloseHandle(m_hCloseEvent); + m_hCloseEvent = 0; } void MFPlayerSession::addProbe(MFAudioProbeControl *probe) @@ -522,6 +525,7 @@ void MFPlayerSession::load(const QMediaContent &media, QIODevice *stream) changeStatus(QMediaPlayer::InvalidMedia); emit error(QMediaPlayer::ResourceError, tr("Invalid stream source."), true); } else { + createSession(); changeStatus(QMediaPlayer::LoadingMedia); m_sourceResolver->load(resources, stream); } @@ -638,6 +642,7 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat break; } } + outputNode->Release(); } sourceNode->Release(); } @@ -703,14 +708,14 @@ IMFTopologyNode* MFPlayerSession::addOutputNode(IMFStreamDescriptor *streamDesc, IMFActivate *activate = NULL; if (MFMediaType_Audio == guidMajorType) { mediaType = Audio; - activate = m_playerService->audioEndpointControl()->currentActivate(); + activate = m_playerService->audioEndpointControl()->createActivate(); } else if (MFMediaType_Video == guidMajorType) { mediaType = Video; if (m_playerService->videoRendererControl()) { - activate = m_playerService->videoRendererControl()->currentActivate(); + activate = m_playerService->videoRendererControl()->createActivate(); #ifndef Q_WS_SIMULATOR } else if (m_playerService->videoWindowControl()) { - activate = m_playerService->videoWindowControl()->currentActivate(); + activate = m_playerService->videoWindowControl()->createActivate(); #endif } else { qWarning() << "no videoWindowControl or videoRendererControl, unable to add output node for video data"; @@ -1136,6 +1141,7 @@ void MFPlayerSession::pause() } else { if (m_state.command == CmdPause) return; + if (SUCCEEDED(m_session->Pause())) { m_state.setCommand(CmdPause); m_pendingState = CmdPending; @@ -1163,6 +1169,14 @@ QMediaPlayer::MediaStatus MFPlayerSession::status() const void MFPlayerSession::createSession() { + close(); + + m_hCloseEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + m_sourceResolver = new SourceResolver(); + QObject::connect(m_sourceResolver, SIGNAL(mediaSourceReady()), this, SLOT(handleMediaSourceReady())); + QObject::connect(m_sourceResolver, SIGNAL(error(long)), this, SLOT(handleSourceError(long))); + Q_ASSERT(m_session == NULL); HRESULT hr = MFCreateMediaSession(NULL, &m_session); if (FAILED(hr)) { @@ -1176,6 +1190,10 @@ void MFPlayerSession::createSession() changeStatus(QMediaPlayer::UnknownMediaStatus); emit error(QMediaPlayer::ResourceError, tr("Unable to pull session events."), false); } + + PropVariantInit(&m_varStart); + m_varStart.vt = VT_I8; + m_varStart.hVal.QuadPart = 0; } qint64 MFPlayerSession::position() @@ -1511,7 +1529,8 @@ HRESULT MFPlayerSession::Invoke(IMFAsyncResult *pResult) } } - emit sessionEvent(pEvent); + if (!m_closing) + emit sessionEvent(pEvent); return S_OK; } @@ -1569,6 +1588,13 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent) case MESessionStarted: if (!m_scrubbing) updatePendingCommands(CmdStart); +#ifndef Q_WS_SIMULATOR + // playback started, we can now set again the procAmpValues if they have been + // changed previously (these are lost when loading a new media) + if (m_playerService->videoWindowControl()) { + m_playerService->videoWindowControl()->setProcAmpValues(); + } +#endif break; case MESessionStopped: if (m_status != QMediaPlayer::EndOfMedia) { @@ -1659,9 +1685,16 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent) m_volumeControl->SetMasterVolume(m_volume); m_volumeControl->SetMute(m_muted); } + DWORD dwCharacteristics = 0; m_sourceResolver->mediaSource()->GetCharacteristics(&dwCharacteristics); emit seekableUpdate(MFMEDIASOURCE_CAN_SEEK & dwCharacteristics); + + // Topology is resolved and successfuly set, this happens only after loading a new media. + // Make sure we always start the media from the beginning + m_varStart.vt = VT_I8; + m_varStart.hVal.QuadPart = 0; + changeStatus(QMediaPlayer::LoadedMedia); } break; diff --git a/src/plugins/wmf/player/mfplayersession.h b/src/plugins/wmf/player/mfplayersession.h index b050ad09..b8b6f085 100644 --- a/src/plugins/wmf/player/mfplayersession.h +++ b/src/plugins/wmf/player/mfplayersession.h @@ -178,6 +178,7 @@ private: SourceResolver *m_sourceResolver; HANDLE m_hCloseEvent; + bool m_closing; enum MediaType { diff --git a/src/plugins/wmf/player/mfvideorenderercontrol.cpp b/src/plugins/wmf/player/mfvideorenderercontrol.cpp index 8d47b1aa..c3c5c1ae 100644 --- a/src/plugins/wmf/player/mfvideorenderercontrol.cpp +++ b/src/plugins/wmf/player/mfvideorenderercontrol.cpp @@ -2130,17 +2130,23 @@ namespace MFVideoRendererControl::MFVideoRendererControl(QObject *parent) : QVideoRendererControl(parent) , m_surface(0) + , m_currentActivate(0) , m_callback(0) { - m_currentActivate = new VideoRendererActivate(this); } MFVideoRendererControl::~MFVideoRendererControl() +{ + clear(); +} + +void MFVideoRendererControl::clear() { if (m_currentActivate) { m_currentActivate->ShutdownObject(); m_currentActivate->Release(); } + m_currentActivate = NULL; } QAbstractVideoSurface *MFVideoRendererControl::surface() const @@ -2150,9 +2156,6 @@ QAbstractVideoSurface *MFVideoRendererControl::surface() const void MFVideoRendererControl::setSurface(QAbstractVideoSurface *surface) { - if (m_surface == surface) - return; - if (m_surface) disconnect(m_surface, SIGNAL(supportedFormatsChanged()), this, SLOT(supportedFormatsChanged())); m_surface = surface; @@ -2160,11 +2163,16 @@ void MFVideoRendererControl::setSurface(QAbstractVideoSurface *surface) if (m_surface) { connect(m_surface, SIGNAL(supportedFormatsChanged()), this, SLOT(supportedFormatsChanged())); } - static_cast(m_currentActivate)->setSurface(m_surface); + + if (m_currentActivate) + static_cast(m_currentActivate)->setSurface(m_surface); } void MFVideoRendererControl::customEvent(QEvent *event) { + if (!m_currentActivate) + return; + if (event->type() == MediaStream::PresentSurface) { MFTIME targetTime = static_cast(event)->targetTime(); MFTIME currentTime = static_cast(m_currentActivate)->getTime(); @@ -2185,16 +2193,26 @@ void MFVideoRendererControl::customEvent(QEvent *event) void MFVideoRendererControl::supportedFormatsChanged() { - static_cast(m_currentActivate)->supportedFormatsChanged(); + if (m_currentActivate) + static_cast(m_currentActivate)->supportedFormatsChanged(); } void MFVideoRendererControl::present() { - static_cast(m_currentActivate)->present(); + if (m_currentActivate) + static_cast(m_currentActivate)->present(); } -IMFActivate* MFVideoRendererControl::currentActivate() const +IMFActivate* MFVideoRendererControl::createActivate() { + clear(); + + m_currentActivate = new VideoRendererActivate(this); + if (m_surface) { + setSurface(m_surface); + supportedFormatsChanged(); + } + return m_currentActivate; } diff --git a/src/plugins/wmf/player/mfvideorenderercontrol.h b/src/plugins/wmf/player/mfvideorenderercontrol.h index 25adcf26..ba04e73b 100644 --- a/src/plugins/wmf/player/mfvideorenderercontrol.h +++ b/src/plugins/wmf/player/mfvideorenderercontrol.h @@ -58,7 +58,7 @@ public: QAbstractVideoSurface *surface() const; void setSurface(QAbstractVideoSurface *surface); - IMFActivate* currentActivate() const; + IMFActivate* createActivate(); protected: void customEvent(QEvent *event); @@ -68,6 +68,8 @@ private Q_SLOTS: void present(); private: + void clear(); + QAbstractVideoSurface *m_surface; IMFActivate *m_currentActivate; IMFSampleGrabberSinkCallback *m_callback; From b5316d29045097b519528820323c29c91e4d8461 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 7 Dec 2012 11:00:28 +0100 Subject: [PATCH 12/33] Doc: Replace outdated macro Change-Id: I9bc0f8a077e60ede0ac1b6852b66d33143eed5a3 Reviewed-by: Jerome Pasion --- src/multimedia/audio/qaudiosystemplugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/multimedia/audio/qaudiosystemplugin.cpp b/src/multimedia/audio/qaudiosystemplugin.cpp index b6e4cdfa..85fa855b 100644 --- a/src/multimedia/audio/qaudiosystemplugin.cpp +++ b/src/multimedia/audio/qaudiosystemplugin.cpp @@ -95,7 +95,7 @@ QT_BEGIN_NAMESPACE /*! Construct a new audio plugin with \a parent. - This is invoked automatically by the Q_EXPORT_PLUGIN2() macro. + This is invoked automatically by the Q_PLUGIN_METADATA() macro. */ QAudioSystemPlugin::QAudioSystemPlugin(QObject* parent) : From 4b62c926b7d9c8a7ae1434b1bdac145882512487 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 10 Dec 2012 14:35:04 +0200 Subject: [PATCH 13/33] Add PLUGIN_CLASS_NAME to qtmultimedia plugins Needed for automating static plugin loading. Task-number: QTBUG-28131 Change-Id: Ia392b112fc46dedd34c9ffdbd6e874dbbfeaef83 Reviewed-by: Oswald Buddenhagen --- src/plugins/audiocapture/audiocapture.pro | 1 + src/plugins/avfoundation/camera/camera.pro | 1 + src/plugins/avfoundation/mediaplayer/mediaplayer.pro | 1 + src/plugins/blackberry/mediaservice/mediaservice.pro | 1 + src/plugins/directshow/directshow.pro | 1 + src/plugins/gstreamer/audiodecoder/audiodecoder.pro | 1 + src/plugins/gstreamer/camerabin/camerabin.pro | 1 + src/plugins/gstreamer/mediacapture/mediacapture.pro | 1 + src/plugins/gstreamer/mediaplayer/mediaplayer.pro | 1 + src/plugins/m3u/m3u.pro | 1 + src/plugins/pulseaudio/pulseaudio.pro | 1 + src/plugins/qt7/qt7.pro | 1 + src/plugins/v4l/v4l.pro | 1 + src/plugins/wmf/wmf.pro | 1 + .../mockserviceplugin1/mockserviceplugin1.pro | 1 + .../mockserviceplugin2/mockserviceplugin2.pro | 1 + .../mockserviceplugin3/mockserviceplugin3.pro | 1 + .../mockserviceplugin4/mockserviceplugin4.pro | 1 + 18 files changed, 18 insertions(+) diff --git a/src/plugins/audiocapture/audiocapture.pro b/src/plugins/audiocapture/audiocapture.pro index f58f43ea..833e4b5f 100644 --- a/src/plugins/audiocapture/audiocapture.pro +++ b/src/plugins/audiocapture/audiocapture.pro @@ -2,6 +2,7 @@ TARGET = qtmedia_audioengine QT += multimedia-private PLUGIN_TYPE=mediaservice +PLUGIN_CLASS_NAME = AudioCaptureServicePlugin load(qt_plugin) HEADERS += audioencodercontrol.h \ diff --git a/src/plugins/avfoundation/camera/camera.pro b/src/plugins/avfoundation/camera/camera.pro index 2eced181..3c751171 100644 --- a/src/plugins/avfoundation/camera/camera.pro +++ b/src/plugins/avfoundation/camera/camera.pro @@ -5,6 +5,7 @@ TARGET = qavfcamera QT += multimedia-private network PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = AVFServicePlugin load(qt_plugin) LIBS += -framework AppKit -framework AudioUnit \ diff --git a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro index 45a30acf..d1957d5f 100644 --- a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro +++ b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro @@ -8,6 +8,7 @@ TARGET = qavfmediaplayer QT += multimedia-private network PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = AVFMediaPlayerServicePlugin load(qt_plugin) LIBS += -framework AVFoundation -framework CoreMedia diff --git a/src/plugins/blackberry/mediaservice/mediaservice.pro b/src/plugins/blackberry/mediaservice/mediaservice.pro index 9c658a57..3a713ee2 100644 --- a/src/plugins/blackberry/mediaservice/mediaservice.pro +++ b/src/plugins/blackberry/mediaservice/mediaservice.pro @@ -3,6 +3,7 @@ QT += multimedia-private gui-private CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice +PLUGIN_CLASS_NAME = BbServicePlugin load(qt_plugin) LIBS += -lmmrndclient -lstrm -lscreen diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index 97f28342..49676989 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -1,6 +1,7 @@ TARGET = dsengine PLUGIN_TYPE=mediaservice +PLUGIN_CLASS_NAME = DSServicePlugin load(qt_plugin) QT += multimedia diff --git a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro index e559f7e0..8cd1d587 100644 --- a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro +++ b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro @@ -1,6 +1,7 @@ TARGET = gstaudiodecoder PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = QGstreamerAudioDecoderServicePlugin load(qt_plugin) include(../common.pri) diff --git a/src/plugins/gstreamer/camerabin/camerabin.pro b/src/plugins/gstreamer/camerabin/camerabin.pro index 5a2dde16..7f84fe54 100644 --- a/src/plugins/gstreamer/camerabin/camerabin.pro +++ b/src/plugins/gstreamer/camerabin/camerabin.pro @@ -3,6 +3,7 @@ TARGET = gstcamerabin QT += multimedia-private PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = CameraBinServicePlugin load(qt_plugin) include(../common.pri) diff --git a/src/plugins/gstreamer/mediacapture/mediacapture.pro b/src/plugins/gstreamer/mediacapture/mediacapture.pro index 9c6cc3c5..e8d039f8 100644 --- a/src/plugins/gstreamer/mediacapture/mediacapture.pro +++ b/src/plugins/gstreamer/mediacapture/mediacapture.pro @@ -1,6 +1,7 @@ TARGET = gstmediacapture PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = QGstreamerCaptureServicePlugin load(qt_plugin) include(../common.pri) diff --git a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro index 70e5c8d0..2ca9377d 100644 --- a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro +++ b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro @@ -1,6 +1,7 @@ TARGET = gstmediaplayer PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = QGstreamerPlayerServicePlugin load(qt_plugin) include(../common.pri) diff --git a/src/plugins/m3u/m3u.pro b/src/plugins/m3u/m3u.pro index 875e815c..3897e2de 100644 --- a/src/plugins/m3u/m3u.pro +++ b/src/plugins/m3u/m3u.pro @@ -2,6 +2,7 @@ TARGET = qtmultimedia_m3u QT += multimedia-private PLUGIN_TYPE=playlistformats +PLUGIN_CLASS_NAME = QM3uPlaylistPlugin load(qt_plugin) HEADERS += qm3uhandler.h diff --git a/src/plugins/pulseaudio/pulseaudio.pro b/src/plugins/pulseaudio/pulseaudio.pro index ac049dc2..e8ab9317 100644 --- a/src/plugins/pulseaudio/pulseaudio.pro +++ b/src/plugins/pulseaudio/pulseaudio.pro @@ -2,6 +2,7 @@ TARGET = qtmedia_pulse QT += multimedia-private PLUGIN_TYPE = audio +PLUGIN_CLASS_NAME = QPulseAudioPlugin load(qt_plugin) CONFIG += link_pkgconfig diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro index edc3ddde..ae87bd44 100644 --- a/src/plugins/qt7/qt7.pro +++ b/src/plugins/qt7/qt7.pro @@ -8,6 +8,7 @@ QT += multimedia-private network } PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = QT7ServicePlugin load(qt_plugin) !simulator { diff --git a/src/plugins/v4l/v4l.pro b/src/plugins/v4l/v4l.pro index 92c56194..c5e95353 100644 --- a/src/plugins/v4l/v4l.pro +++ b/src/plugins/v4l/v4l.pro @@ -2,6 +2,7 @@ TARGET = qtmedia_v4lengine QT += multimedia-private PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = V4LServicePlugin load(qt_plugin) HEADERS += v4lserviceplugin.h diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro index b9c2b415..e16c91e2 100644 --- a/src/plugins/wmf/wmf.pro +++ b/src/plugins/wmf/wmf.pro @@ -6,6 +6,7 @@ QT += multimedia-private network } PLUGIN_TYPE=mediaservice +PLUGIN_CLASS_NAME = WMFServicePlugin load(qt_plugin) DEPENDPATH += . diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro index ad311169..843574eb 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro @@ -3,6 +3,7 @@ QT += multimedia-private CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice +PLUGIN_CLASS_NAME = MockServicePlugin1 load(qt_plugin) DESTDIR = ../$${PLUGIN_TYPE} diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro index 6b30d777..41380f74 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro @@ -3,6 +3,7 @@ QT += multimedia-private CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice +PLUGIN_CLASS_NAME = MockServicePlugin2 load(qt_plugin) DESTDIR = ../$${PLUGIN_TYPE} diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro index bae1af98..0e5ff0b8 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro @@ -3,6 +3,7 @@ QT += multimedia-private CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice +PLUGIN_CLASS_NAME = MockServicePlugin3 load(qt_plugin) DESTDIR = ../$${PLUGIN_TYPE} diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro index ccd8b0ed..3e83ac92 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro @@ -3,6 +3,7 @@ QT += multimedia-private CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice +PLUGIN_CLASS_NAME = MockServicePlugin4 load(qt_plugin) DESTDIR = ../$${PLUGIN_TYPE} From 3f84142aaa0c63edf6fdc1e144ab29be51a29af9 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Tue, 11 Dec 2012 16:36:53 +0100 Subject: [PATCH 14/33] WMF: Improved error reporting. When loading the source fails because the file format is not supported, we now report a FormatError instead of a ResourceError. When the file format is supported but the media cannot be played (topology cannot be resolved), it is most likely caused by a missing codec and we then report a FormatError. Change-Id: I101a86c129a0c5dccb543fc1247cb741994684fd Reviewed-by: Andy Nichols --- src/plugins/wmf/player/mfplayersession.cpp | 62 ++++++++++++---------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/src/plugins/wmf/player/mfplayersession.cpp b/src/plugins/wmf/player/mfplayersession.cpp index 7b35af43..1eb91c20 100644 --- a/src/plugins/wmf/player/mfplayersession.cpp +++ b/src/plugins/wmf/player/mfplayersession.cpp @@ -547,6 +547,10 @@ void MFPlayerSession::handleSourceError(long hr) case NS_E_SERVER_NOT_FOUND: errorString = tr("The specified server could not be found."); break; + case MF_E_UNSUPPORTED_BYTESTREAM_TYPE: + errorCode = QMediaPlayer::FormatError; + errorString = tr("Unsupported media type."); + break; default: errorString = tr("Failed to load source."); break; @@ -1621,6 +1625,37 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent) qDebug() << "MEReconnectEnd" << ((hrStatus == S_OK) ? "OK" : "Failed"); #endif break; + case MESessionTopologySet: + if (FAILED(hrStatus)) { + changeStatus(QMediaPlayer::InvalidMedia); + emit error(QMediaPlayer::FormatError, tr("Unsupported media, a codec is missing."), true); + } else { + if (m_audioSampleGrabberNode) { + IMFMediaType *mediaType = 0; + hr = MFGetTopoNodeCurrentType(m_audioSampleGrabberNode, 0, FALSE, &mediaType); + if (SUCCEEDED(hr)) { + m_audioSampleGrabber->setFormat(audioFormatForMFMediaType(mediaType)); + mediaType->Release(); + } + } + + if (SUCCEEDED(MFGetService(m_session, MR_POLICY_VOLUME_SERVICE, IID_PPV_ARGS(&m_volumeControl)))) { + m_volumeControl->SetMasterVolume(m_volume); + m_volumeControl->SetMute(m_muted); + } + + DWORD dwCharacteristics = 0; + m_sourceResolver->mediaSource()->GetCharacteristics(&dwCharacteristics); + emit seekableUpdate(MFMEDIASOURCE_CAN_SEEK & dwCharacteristics); + + // Topology is resolved and successfuly set, this happens only after loading a new media. + // Make sure we always start the media from the beginning + m_varStart.vt = VT_I8; + m_varStart.hVal.QuadPart = 0; + + changeStatus(QMediaPlayer::LoadedMedia); + } + break; } if (FAILED(hrStatus)) { @@ -1671,33 +1706,6 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent) } } break; - case MESessionTopologySet: { - if (m_audioSampleGrabberNode) { - IMFMediaType *mediaType = 0; - hr = MFGetTopoNodeCurrentType(m_audioSampleGrabberNode, 0, FALSE, &mediaType); - if (SUCCEEDED(hr)) { - m_audioSampleGrabber->setFormat(audioFormatForMFMediaType(mediaType)); - mediaType->Release(); - } - } - - if (SUCCEEDED(MFGetService(m_session, MR_POLICY_VOLUME_SERVICE, IID_PPV_ARGS(&m_volumeControl)))) { - m_volumeControl->SetMasterVolume(m_volume); - m_volumeControl->SetMute(m_muted); - } - - DWORD dwCharacteristics = 0; - m_sourceResolver->mediaSource()->GetCharacteristics(&dwCharacteristics); - emit seekableUpdate(MFMEDIASOURCE_CAN_SEEK & dwCharacteristics); - - // Topology is resolved and successfuly set, this happens only after loading a new media. - // Make sure we always start the media from the beginning - m_varStart.vt = VT_I8; - m_varStart.hVal.QuadPart = 0; - - changeStatus(QMediaPlayer::LoadedMedia); - } - break; case MESessionTopologyStatus: { UINT32 status; if (SUCCEEDED(sessionEvent->GetUINT32(MF_EVENT_TOPOLOGY_STATUS, &status))) { From 12bbd990473677c5b3b1c37c317819e73b606e4a Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Tue, 11 Dec 2012 17:13:26 +0100 Subject: [PATCH 15/33] WMF: Fixed crash when cancelling media loading. Since media loading is asynchronous, cancelling could cause a crash when done after the media is loaded but the callback hasn't been called yet. Change-Id: I9c9b7bfaa495b9e75765111c15afb07e8b699488 Reviewed-by: Andy Nichols --- src/plugins/wmf/sourceresolver.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/wmf/sourceresolver.cpp b/src/plugins/wmf/sourceresolver.cpp index c5d99959..9abe6584 100644 --- a/src/plugins/wmf/sourceresolver.cpp +++ b/src/plugins/wmf/sourceresolver.cpp @@ -108,6 +108,10 @@ STDMETHODIMP_(ULONG) SourceResolver::Release(void) HRESULT STDMETHODCALLTYPE SourceResolver::Invoke(IMFAsyncResult *pAsyncResult) { QMutexLocker locker(&m_mutex); + + if (!m_sourceResolver) + return S_OK; + MF_OBJECT_TYPE ObjectType = MF_OBJECT_INVALID; IUnknown* pSource = NULL; State *state = static_cast(pAsyncResult->GetStateNoAddRef()); From 4e79e3cebd7a27168c0b0b5f00907f96d359309c Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 11 Dec 2012 20:01:12 +0100 Subject: [PATCH 16/33] test: Mark tst_QDeclarativeVideoOutputWindow as insignificant on Windows Task-number: QTBUG-28541 Change-Id: I5d59a1daf5494aca28a573e312bbf1bf8e7d95e2 Reviewed-by: Lars Knoll --- .../qdeclarativevideooutput_window.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro index 222ed513..ba7743e4 100644 --- a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro +++ b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro @@ -12,3 +12,5 @@ SOURCES += \ INCLUDEPATH += ../../../../src/imports/multimedia DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +win32:contains(QT_CONFIG, angle): CONFIG += insignificant_test # QTBUG-28541 From 5cd23af26c6c627ac10b418043690c1deb17627d Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 11 Dec 2012 20:04:13 +0100 Subject: [PATCH 17/33] test: Mark tst_QPainterVideoSurface as insignificant on Windows Task-number: QTBUG-28542 Change-Id: Ib879ffd31e534cc9cde4c4893af6f2a7799529cd Reviewed-by: Lars Knoll --- tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro index 2bbc10b3..1098dd16 100644 --- a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro +++ b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro @@ -15,3 +15,5 @@ SOURCES += tst_qpaintervideosurface.cpp QT+=widgets DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +win32:contains(QT_CONFIG, angle): CONFIG += insignificant_test # QTBUG-28542 From 0241b0e39c4ac259c2336d074f1fa488d0e0ebcc Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Wed, 12 Dec 2012 16:35:15 +0100 Subject: [PATCH 18/33] Doc: Updated the \example and \snippet paths Also: - Grouped the example docs under one group. i.e. multimedia-examples - Moved the \group page here from the qtdoc repo - Moved the snippets directory under doc from doc/src Change-Id: I28fb81cf910e58101cd601fb4c440b59b0b0366d Reviewed-by: Jerome Pasion --- .../audiodevices/doc/src/audiodevices.qdoc | 4 +- .../audioengine/doc/src/audioengine.qdoc | 4 +- .../audioinput/doc/src/audioinput.qdoc | 4 +- .../audiooutput/doc/src/audiooutput.qdoc | 4 +- .../audiorecorder/doc/src/audiorecorder.qdoc | 8 +--- .../doc/src/declarative-radio.qdoc | 7 ++- .../multimedia/spectrum/doc/src/spectrum.qdoc | 6 +-- .../multimedia/video/doc/src/qmlvideo.qdoc | 48 +++++++++---------- .../multimedia/video/doc/src/qmlvideofx.qdoc | 29 ++++++----- .../camera/doc/src/camera.qdoc | 6 +-- .../doc/src/declarative-camera.qdoc | 5 +- .../player/doc/src/player.qdoc | 6 +-- .../doc/src/videographicsitem.qdoc | 4 +- .../videowidget/doc/src/videowidget.qdoc | 4 +- src/multimedia/doc/qtmultimedia.qdocconf | 1 + .../snippets/multimedia-snippets/audio.cpp | 0 .../multimedia-snippets/audiorecorder.cpp | 0 .../snippets/multimedia-snippets/camera.cpp | 0 .../snippets/multimedia-snippets/media.cpp | 0 .../multimedia-snippets.pro | 0 .../snippets/multimedia-snippets/qsound.cpp | 0 .../multimedia-snippets/soundeffect.qml | 0 .../snippets/multimedia-snippets/video.cpp | 0 .../doc/{src => }/snippets/snippets.pro | 0 src/multimedia/doc/src/audiooverview.qdoc | 10 ++-- src/multimedia/doc/src/cameraoverview.qdoc | 8 ++-- .../doc/src/qtmultimedia-examples.qdoc | 37 ++++++++++++++ .../doc/src/qtmultimedia-index.qdoc | 19 +------- src/multimedia/doc/src/videooverview.qdoc | 12 ++--- src/multimedia/qmediacontrol.cpp | 6 +-- src/multimedia/qmediaservice.cpp | 2 +- src/multimedia/radio/qradiodata.cpp | 2 +- src/multimedia/radio/qradiotuner.cpp | 2 +- src/multimedia/recording/qaudiorecorder.cpp | 4 +- .../recording/qmediaencodersettings.cpp | 6 +-- src/multimedia/recording/qmediarecorder.cpp | 2 +- 36 files changed, 133 insertions(+), 117 deletions(-) rename src/multimedia/doc/{src => }/snippets/multimedia-snippets/audio.cpp (100%) rename src/multimedia/doc/{src => }/snippets/multimedia-snippets/audiorecorder.cpp (100%) rename src/multimedia/doc/{src => }/snippets/multimedia-snippets/camera.cpp (100%) rename src/multimedia/doc/{src => }/snippets/multimedia-snippets/media.cpp (100%) rename src/multimedia/doc/{src => }/snippets/multimedia-snippets/multimedia-snippets.pro (100%) rename src/multimedia/doc/{src => }/snippets/multimedia-snippets/qsound.cpp (100%) rename src/multimedia/doc/{src => }/snippets/multimedia-snippets/soundeffect.qml (100%) rename src/multimedia/doc/{src => }/snippets/multimedia-snippets/video.cpp (100%) rename src/multimedia/doc/{src => }/snippets/snippets.pro (100%) create mode 100644 src/multimedia/doc/src/qtmultimedia-examples.qdoc diff --git a/examples/multimedia/audiodevices/doc/src/audiodevices.qdoc b/examples/multimedia/audiodevices/doc/src/audiodevices.qdoc index d2522f3a..af51e373 100644 --- a/examples/multimedia/audiodevices/doc/src/audiodevices.qdoc +++ b/examples/multimedia/audiodevices/doc/src/audiodevices.qdoc @@ -26,9 +26,9 @@ ****************************************************************************/ /*! - \example audiodevices + \example multimedia/audiodevices \title Audio Devices Example - \ingroup audio_examples + \ingroup multimedia_examples \brief The Audio Devices example shows the application of the audio devices APIs diff --git a/examples/multimedia/audioengine/doc/src/audioengine.qdoc b/examples/multimedia/audioengine/doc/src/audioengine.qdoc index bea4d4b5..ba2f17c5 100644 --- a/examples/multimedia/audioengine/doc/src/audioengine.qdoc +++ b/examples/multimedia/audioengine/doc/src/audioengine.qdoc @@ -26,9 +26,9 @@ ****************************************************************************/ /*! - \example audioengine + \example multimedia/audioengine \title AudioEngine Example - \ingroup audioengine_examples + \ingroup multimedia_examples \brief The Audio Engine example demonstrates 3D sound control using the QtAudioEngine API. diff --git a/examples/multimedia/audioinput/doc/src/audioinput.qdoc b/examples/multimedia/audioinput/doc/src/audioinput.qdoc index 4fc7e6e6..ccd4ed26 100644 --- a/examples/multimedia/audioinput/doc/src/audioinput.qdoc +++ b/examples/multimedia/audioinput/doc/src/audioinput.qdoc @@ -26,9 +26,9 @@ ****************************************************************************/ /*! - \example audioinput + \example multimedia/audioinput \title Audio Input Example - \ingroup audio_examples + \ingroup multimedia_examples \brief The Audio Input Example shows the use of the QAudioInput class. The example demonstrates the basic use cases of the QAudioInput class. diff --git a/examples/multimedia/audiooutput/doc/src/audiooutput.qdoc b/examples/multimedia/audiooutput/doc/src/audiooutput.qdoc index c29fcd81..91c735fa 100644 --- a/examples/multimedia/audiooutput/doc/src/audiooutput.qdoc +++ b/examples/multimedia/audiooutput/doc/src/audiooutput.qdoc @@ -26,9 +26,9 @@ ****************************************************************************/ /*! - \example audiooutput + \example multimedia/audiooutput \title Audio Output Example - \ingroup audio_examples + \ingroup multimedia_examples \brief The Audio Output Example show the use of the QAudioOutput API. The example demonstrates the basic use cases of the QAudioOutput class. diff --git a/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc index 3dea92ca..df3ce138 100644 --- a/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc +++ b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc @@ -26,9 +26,9 @@ ****************************************************************************/ /*! - \example audiorecorder + \example multimedia/audiorecorder \title Audio Recorder Example - \ingroup audio_examples + \ingroup multimedia_examples \brief The Audio Recorder Example shows how to create a simple audio recorder. It demonstrates the discovery of the supported devices and codecs and the use @@ -95,10 +95,6 @@ \code ui->statusbar->showMessage(tr("Recorded %1 sec").arg(duration / 1000)); \endcode - - - - */ diff --git a/examples/multimedia/declarative-radio/doc/src/declarative-radio.qdoc b/examples/multimedia/declarative-radio/doc/src/declarative-radio.qdoc index 8b52e6c7..bf3f39ca 100644 --- a/examples/multimedia/declarative-radio/doc/src/declarative-radio.qdoc +++ b/examples/multimedia/declarative-radio/doc/src/declarative-radio.qdoc @@ -26,10 +26,13 @@ ****************************************************************************/ /*! - \example declarative-radio + \example multimedia/declarative-radio \title Declarative Radio Example + \brief Demonstrates the radio functionality + \ingroup multimedia_examples - + This examples uses the Qt Multimedia Radio QML type to list the available + channels on the FM frequency. */ diff --git a/examples/multimedia/spectrum/doc/src/spectrum.qdoc b/examples/multimedia/spectrum/doc/src/spectrum.qdoc index 64c6f836..5e91af43 100644 --- a/examples/multimedia/spectrum/doc/src/spectrum.qdoc +++ b/examples/multimedia/spectrum/doc/src/spectrum.qdoc @@ -26,12 +26,12 @@ ****************************************************************************/ /*! - \example spectrum + \example multimedia/spectrum \title Spectrum Example - \ingroup audio_examples + \ingroup multimedia_examples \brief The Spectrum Example uses a combination multimedia APIs to process microphone input. - The Spectrum Analyzer example shows how the \l{QtMultimedia Module} can be + The Spectrum Analyzer example shows how the \l{Qt Multimedia} module can be used to record and then play back an audio stream. \image spectrum-demo.png diff --git a/examples/multimedia/video/doc/src/qmlvideo.qdoc b/examples/multimedia/video/doc/src/qmlvideo.qdoc index c27ca1bc..359d0715 100644 --- a/examples/multimedia/video/doc/src/qmlvideo.qdoc +++ b/examples/multimedia/video/doc/src/qmlvideo.qdoc @@ -26,9 +26,9 @@ ****************************************************************************/ /*! -\example video/qmlvideo +\example multimedia/video/qmlvideo \title QML Video Example -\ingroup video_examples_qml +\ingroup multimedia_examples \brief The QML Video Example demonstrates the various manipulations (move; resize; rotate; change aspect ratio) which can be applied to QML \l{VideoOutput} @@ -52,15 +52,15 @@ which moves across the \l{VideoOutput} item. \section1 Application structure -The \l{video/qmlvideo/qml/qmlvideo/main.qml} file creates a UI which includes +The \l{multimedia/video/qmlvideo/qml/qmlvideo/main.qml} file creates a UI which includes the following items: \list - \li Two \l{video/qmlvideo/qml/qmlvideo/Button.qml}{Button} instances, each + \li Two \l{multimedia/video/qmlvideo/qml/qmlvideo/Button.qml}{Button} instances, each of which displays a filename, and can be used to launch a - \l{video/qmlvideo/qml/qmlvideo/FileBrowser.qml}{FileBrowser} - \li An exit \l{video/qmlvideo/qml/qmlvideo/Button.qml}{Button} - \li A \l{video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml}{SceneSelectionPanel}, + \l{multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml}{FileBrowser} + \li An exit \l{multimedia/video/qmlvideo/qml/qmlvideo/Button.qml}{Button} + \li A \l{multimedia/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml}{SceneSelectionPanel}, which is a flickable list displaying the available scenes \li At the lower left, an item which displays the QML repainting rate - the upper number is the instantaneous frame rate and the lower number is the @@ -72,18 +72,18 @@ the following items: Each scene in the flickable list is implemented in its own QML file - for example the video-basic scene (which just displays a static \l{VideoOutput} in the center of the screen) is implemented in the -\l{video/qmlvideo/qml/qmlvideo/VideoBasic.qml}{VideoBasic.qml} file. As you +\l{multimedia/ideo/qmlvideo/qml/qmlvideo/VideoBasic.qml}{VideoBasic.qml} file. As you can see from the code, this makes use of a type of inheritance: a -\l{video/qmlvideo/qml/qmlvideo/VideoBasic.qml}{VideoBasic} item ... +\l{multimedia/video/qmlvideo/qml/qmlvideo/VideoBasic.qml}{VideoBasic} item ... -\quotefromfile video/qmlvideo/qml/qmlvideo/VideoBasic.qml +\quotefromfile multimedia/video/qmlvideo/qml/qmlvideo/VideoBasic.qml \skipto import \printuntil /^\}/ ... is-a -\l{video/qmlvideo/qml/qmlvideo/SceneBasic.qml}{SceneBasic} ... +\l{multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml}{SceneBasic} ... -\quotefromfile video/qmlvideo/qml/qmlvideo/SceneBasic.qml +\quotefromfile multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml \skipto import \printuntil contentType \dots @@ -94,9 +94,9 @@ can see from the code, this makes use of a type of inheritance: a \printuntil /^\}/ ... which is-a -\l{video/qmlvideo/qml/qmlvideo/Scene.qml}{Scene}: +\l{multimedia/video/qmlvideo/qml/qmlvideo/Scene.qml}{Scene}: -\quotefromfile video/qmlvideo/qml/qmlvideo/Scene.qml +\quotefromfile multimedia/video/qmlvideo/qml/qmlvideo/Scene.qml \skipto import \printuntil root \dots @@ -106,35 +106,35 @@ can see from the code, this makes use of a type of inheritance: a \skipto Button \printuntil /^\}/ -\l{video/qmlvideo/qml/qmlvideo/SceneBasic.qml}{SceneBasic} describes the +\l{multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml}{SceneBasic} describes the structure and behaviour of the scene, but is agnostic of the type of content which will be displayed - this is abstracted by -\l{video/qmlvideo/qml/qmlvideo/Content.qml}{Content}. +\l{multimedia/video/qmlvideo/qml/qmlvideo/Content.qml}{Content}. This pattern allows us to define a particular use case (in this case, simply display a static piece of content), and then instantiate that use case for both video content -(\l{video/qmlvideo/qml/qmlvideo/VideoBasic.qml}{VideoBasic}) and cameracontent -(\l{video/qmlvideo/qml/qmlvideo/CameraBasic.qml}{CameraBasic}). This approach +(\l{multimedia/video/qmlvideo/qml/qmlvideo/VideoBasic.qml}{VideoBasic}) and cameracontent +(\l{multimedia/video/qmlvideo/qml/qmlvideo/CameraBasic.qml}{CameraBasic}). This approach is used to implement many of the other scenes - for example, "repeatedly slide the content from left to right and back again" is implemented by -\l{video/qmlvideo/qml/qmlvideo/SceneMove.qml}{SceneMove}, on which -\l{video/qmlvideo/qml/qmlvideo/VideoMove.qml}{VideoMove} and -\l{video/qmlvideo/qml/qmlvideo/CameraMove.qml}{CameraMove} are based. +\l{multimedia/video/qmlvideo/qml/qmlvideo/SceneMove.qml}{SceneMove}, on which +\l{multimedia/video/qmlvideo/qml/qmlvideo/VideoMove.qml}{VideoMove} and +\l{multimedia/video/qmlvideo/qml/qmlvideo/CameraMove.qml}{CameraMove} are based. Depending on the value of the contentType property in the top-level scene instance, the embedded -\l{video/qmlvideo/qml/qmlvideo/Content.qml}{Content} item creates either a +\l{multimedia/video/qmlvideo/qml/qmlvideo/Content.qml}{Content} item creates either a \l{MediaPlayer} or a \l{Camera} item. \section1 Calculating and displaying QML painting rate -\input examples/video-qml-paint-rate.qdocinc +\input video-qml-paint-rate.qdocinc All that remains is to connect the afterRendering() signal of the QQuickView object to a JavaScript function, which will eventually call frequencyItem.notify(): -\quotefromfile video/qmlvideo/main.cpp +\quotefromfile multimedia/video/qmlvideo/main.cpp \skipto QmlApplicationViewer \printuntil ; \dots diff --git a/examples/multimedia/video/doc/src/qmlvideofx.qdoc b/examples/multimedia/video/doc/src/qmlvideofx.qdoc index f9b32408..b6535a95 100644 --- a/examples/multimedia/video/doc/src/qmlvideofx.qdoc +++ b/examples/multimedia/video/doc/src/qmlvideofx.qdoc @@ -26,10 +26,9 @@ ****************************************************************************/ /*! -\example video/qmlvideofx +\example multimedia/video/qmlvideofx \title QML Video Shader Effects Example -\ingroup video_examples_qml -\ingroup camera_examples_qml +\ingroup multimedia_examples \brief The QML Video Shader Effects Example shows how \l {ShaderEffect} can be used to apply postprocessing effects, expressed in \c GLSL, to video @@ -135,10 +134,10 @@ types is a bit more complicated, for the following reasons: \endlist The abstraction of source item type is achieved by the -\l{video/qmlvideofx/qml/qmlvideofx/Content.qml}{Content}, which uses a +\l{multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml}{Content}, which uses a \l{Loader} to create either a \l{MediaPlayer}, \l{Camera} or \l{Image}: -\quotefromfile video/qmlvideofx/qml/qmlvideofx/Content.qml +\quotefromfile multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml \skipto import \printuntil { \dots @@ -165,10 +164,10 @@ The abstraction of source item type is achieved by the \printuntil } Each effect is implemented as a QML item which is based on the -\l{video/qmlvideofx/qml/qmlvideofx/Effect.qml}{Effect}, which in turn +\l{multimedia/video/qmlvideofx/qml/qmlvideofx/Effect.qml}{Effect}, which in turn is based on the \l{ShaderEffect}: -\quotefromfile video/qmlvideofx/qml/qmlvideofx/Effect.qml +\quotefromfile multimedia/video/qmlvideofx/qml/qmlvideofx/Effect.qml \skipto import \printuntil /^\}/ @@ -180,20 +179,20 @@ implementation of the pixelation effect. As you can see, the pixelation effect supports one parameter (which controls the pixelation granularity), and states that the divider should be displayed. -\quotefromfile video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml +\quotefromfile multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml \skipto import \printuntil /^\}/ The main.qml file shows a -\l{video/qmlvideofx/qml/qmlvideofx/FileOpen.qml}{FileOpen}, which allows +\l{multimedia/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml}{FileOpen}, which allows the user to select the input source and an -\l{video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml}{EffectSelectionPanel} +\l{multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml}{EffectSelectionPanel} item, which lists each of the available shader effects. As described above, a -\l{video/qmlvideofx/qml/qmlvideofx/Content.qml}{Content} item is used to load the +\l{multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml}{Content} item is used to load the appropriate input and effect type. A -\l{video/qmlvideofx/qml/qmlvideofx/Divider.qml}{Divider} item draws the +\l{multimedia/video/qmlvideofx/qml/qmlvideofx/Divider.qml}{Divider} item draws the vertical dividing line, which can be dragged left / right by the user. Finally, -a \l{video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml}{ParameterPanel} item +a \l{multimedia/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml}{ParameterPanel} item renders the sliders corresponding to each effect parameter. Here is the source selection menu: @@ -204,12 +203,12 @@ And here is the effect selection menu: \section1 Calculating and displaying QML painting rate -\input examples/video-qml-paint-rate.qdocinc +\input video-qml-paint-rate.qdocinc All that remains is to connect the afterRendering() signal of the QQuickView object to a JavaScript function, which will eventually call frequencyItem.notify(): -\quotefromfile video/qmlvideofx/main.cpp +\quotefromfile multimedia/video/qmlvideofx/main.cpp \skipto QmlApplicationViewer \printuntil ; \dots diff --git a/examples/multimediawidgets/camera/doc/src/camera.qdoc b/examples/multimediawidgets/camera/doc/src/camera.qdoc index c40c2513..15bf9fdd 100644 --- a/examples/multimediawidgets/camera/doc/src/camera.qdoc +++ b/examples/multimediawidgets/camera/doc/src/camera.qdoc @@ -29,14 +29,12 @@ /*! -\example camera +\example multimediawidgets/camera \title Camera Example -\ingroup camera_examples +\ingroup multimedia_examples \brief The Camera Example shows how to use the API to capture a still image or video. - - The Camera Example demonstrates how you can use QtMultimedia to implement some basic Camera functionality to take still images and record video clips with audio. diff --git a/examples/multimediawidgets/declarative-camera/doc/src/declarative-camera.qdoc b/examples/multimediawidgets/declarative-camera/doc/src/declarative-camera.qdoc index 37f35ea2..c98688b0 100644 --- a/examples/multimediawidgets/declarative-camera/doc/src/declarative-camera.qdoc +++ b/examples/multimediawidgets/declarative-camera/doc/src/declarative-camera.qdoc @@ -26,10 +26,9 @@ ****************************************************************************/ /*! -\example declarative-camera +\example multimediawidgets/declarative-camera \title QML Camera Example -\ingroup camera_examples_qml - +\ingroup multimedia_examples \brief The Camera Example shows how to use the API to capture a still image or video. diff --git a/examples/multimediawidgets/player/doc/src/player.qdoc b/examples/multimediawidgets/player/doc/src/player.qdoc index 5e98b912..5522425c 100644 --- a/examples/multimediawidgets/player/doc/src/player.qdoc +++ b/examples/multimediawidgets/player/doc/src/player.qdoc @@ -26,10 +26,10 @@ ****************************************************************************/ /*! - \example player + \example multimediawidgets/player \title Media Player Example - \ingroup video_examples - + \ingroup multimedia_examples + \brief Demonstrates the audio and video playback functionality This example creates a simple multimedia player. We can play audio and or video files using various codecs. diff --git a/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc b/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc index c1eb0ccc..6deca4ce 100644 --- a/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc +++ b/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc @@ -26,9 +26,9 @@ ****************************************************************************/ /*! -\example videographicsitem +\example multimediawidgets/videographicsitem \title Video Graphics Item Example -\ingroup video_examples +\ingroup multimedia_examples \brief This example demonstrates how to stream video on a graphics scene. The Video Graphics Item example shows how to implement a QGraphicsItem that displays video on a diff --git a/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc b/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc index 860cb7ac..9a95f0ca 100644 --- a/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc +++ b/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc @@ -26,9 +26,9 @@ ****************************************************************************/ /*! - \example videowidget + \example multimediawidgets/videowidget \title Video Widget Example - \ingroup video_examples + \ingroup multimedia_examples \brief This example is a simple video player The Video Widget example denonstrates how to implement a video widget using diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf index a6c9576b..08a62890 100644 --- a/src/multimedia/doc/qtmultimedia.qdocconf +++ b/src/multimedia/doc/qtmultimedia.qdocconf @@ -30,6 +30,7 @@ qhp.qtmultimedia.subprojects.qmltypes.selectors = class fake:headerfile qhp.qtmultimedia.subprojects.qmltypes.sortPages = true exampledirs += ../../../examples \ + snippets headerdirs += ../.. diff --git a/src/multimedia/doc/src/snippets/multimedia-snippets/audio.cpp b/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp similarity index 100% rename from src/multimedia/doc/src/snippets/multimedia-snippets/audio.cpp rename to src/multimedia/doc/snippets/multimedia-snippets/audio.cpp diff --git a/src/multimedia/doc/src/snippets/multimedia-snippets/audiorecorder.cpp b/src/multimedia/doc/snippets/multimedia-snippets/audiorecorder.cpp similarity index 100% rename from src/multimedia/doc/src/snippets/multimedia-snippets/audiorecorder.cpp rename to src/multimedia/doc/snippets/multimedia-snippets/audiorecorder.cpp diff --git a/src/multimedia/doc/src/snippets/multimedia-snippets/camera.cpp b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp similarity index 100% rename from src/multimedia/doc/src/snippets/multimedia-snippets/camera.cpp rename to src/multimedia/doc/snippets/multimedia-snippets/camera.cpp diff --git a/src/multimedia/doc/src/snippets/multimedia-snippets/media.cpp b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp similarity index 100% rename from src/multimedia/doc/src/snippets/multimedia-snippets/media.cpp rename to src/multimedia/doc/snippets/multimedia-snippets/media.cpp diff --git a/src/multimedia/doc/src/snippets/multimedia-snippets/multimedia-snippets.pro b/src/multimedia/doc/snippets/multimedia-snippets/multimedia-snippets.pro similarity index 100% rename from src/multimedia/doc/src/snippets/multimedia-snippets/multimedia-snippets.pro rename to src/multimedia/doc/snippets/multimedia-snippets/multimedia-snippets.pro diff --git a/src/multimedia/doc/src/snippets/multimedia-snippets/qsound.cpp b/src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp similarity index 100% rename from src/multimedia/doc/src/snippets/multimedia-snippets/qsound.cpp rename to src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp diff --git a/src/multimedia/doc/src/snippets/multimedia-snippets/soundeffect.qml b/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml similarity index 100% rename from src/multimedia/doc/src/snippets/multimedia-snippets/soundeffect.qml rename to src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml diff --git a/src/multimedia/doc/src/snippets/multimedia-snippets/video.cpp b/src/multimedia/doc/snippets/multimedia-snippets/video.cpp similarity index 100% rename from src/multimedia/doc/src/snippets/multimedia-snippets/video.cpp rename to src/multimedia/doc/snippets/multimedia-snippets/video.cpp diff --git a/src/multimedia/doc/src/snippets/snippets.pro b/src/multimedia/doc/snippets/snippets.pro similarity index 100% rename from src/multimedia/doc/src/snippets/snippets.pro rename to src/multimedia/doc/snippets/snippets.pro diff --git a/src/multimedia/doc/src/audiooverview.qdoc b/src/multimedia/doc/src/audiooverview.qdoc index 723afb71..20c5342e 100644 --- a/src/multimedia/doc/src/audiooverview.qdoc +++ b/src/multimedia/doc/src/audiooverview.qdoc @@ -50,16 +50,16 @@ may have installed. Here is how you play a local file using C++: - \snippet doc/src/snippets/multimedia-snippets/media.cpp Local playback + \snippet multimedia-snippets/media.cpp Local playback You can also put files (even remote URLs) into a playlist: - \snippet doc/src/snippets/multimedia-snippets/media.cpp Audio playlist + \snippet multimedia-snippets/media.cpp Audio playlist \section2 Recording Audio to a File For recording audio to a file, the \l {QAudioRecorder} class allows you to compress audio data from an input device and record it. - \snippet doc/src/snippets/multimedia-snippets/media.cpp Audio recorder + \snippet multimedia-snippets/media.cpp Audio recorder \section2 Low Latency Sound Effects @@ -87,7 +87,7 @@ they may arrive at a slightly different time than the media pipeline processes them. Here's an example of installing a probe during recording: - \snippet doc/src/snippets/multimedia-snippets/media.cpp Audio probe + \snippet multimedia-snippets/media.cpp Audio probe \section2 Low Level Audio Playback and Recording Qt Multimedia offers classes for raw access to audio input and output @@ -123,7 +123,7 @@ or from a QIODevice instances. Here's an example of decoding a local file: - \snippet doc/src/snippets/multimedia-snippets/audio.cpp Local audio decoding + \snippet multimedia-snippets/audio.cpp Local audio decoding Note: This API is preliminary at this time - the API may change or be removed before the final 5.0 release. diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc index f6bf4f53..40c82a69 100644 --- a/src/multimedia/doc/src/cameraoverview.qdoc +++ b/src/multimedia/doc/src/cameraoverview.qdoc @@ -118,14 +118,14 @@ In C++, your choice depends on whether you are using widgets, or QGraphicsView. The \l QVideoWidget class is used in the widgets case, and \l QGraphicsVideoItem is useful for QGraphicsView. - \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera overview viewfinder + \snippet multimedia-snippets/camera.cpp Camera overview viewfinder For advanced usage (like processing viewfinder frames as they come, to detect objects or patterns), you can also derive from \l QAbstractVideoSurface and set that as the viewfinder for the QCamera object. In this case you will need to render the viewfinder image yourself. - \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera overview surface + \snippet multimedia-snippets/camera.cpp Camera overview surface \section2 Still Images @@ -136,7 +136,7 @@ that things are in focus and the settings are not different from the viewfinder while the image capture occurs, capture the image, and finally unlock the camera ready for the next photo. - \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera overview capture + \snippet multimedia-snippets/camera.cpp Camera overview capture \section2 Movies @@ -146,7 +146,7 @@ video requires the use of a \l QMediaRecorder object. To record video we need to create a camera object as before but this time as well as creating a viewfinder, we will also initialize a media recorder object. - \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera overview movie + \snippet multimedia-snippets/camera.cpp Camera overview movie Signals from the \e mediaRecorder can be connected to slots to react to changes in the state of the recorder or error events. Recording itself diff --git a/src/multimedia/doc/src/qtmultimedia-examples.qdoc b/src/multimedia/doc/src/qtmultimedia-examples.qdoc new file mode 100644 index 00000000..4427e16f --- /dev/null +++ b/src/multimedia/doc/src/qtmultimedia-examples.qdoc @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \group multimedia_examples + \ingroup all-examples + \title Qt Multimedia Examples + \brief Demonstrates the multimedia functionality provided by Qt. + + The \l{Qt Multimedia} module provides low-level audio support on Linux, + Windows and Mac OS X. It also provides audio plugin API to allow developers + implement their own audio support for custom devices and platforms. +*/ diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc index dcf438d5..e7838cfd 100644 --- a/src/multimedia/doc/src/qtmultimedia-index.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc @@ -128,23 +128,6 @@ \section2 Examples \list - \li QML - \list - \li \l{video/qmlvideo}{qmlvideo} - \li \l{video/qmlvideofx}{qmlvideofx} - \li \l{declarative-camera} - \li \l{declarative-radio} - \endlist - \li C++ - \list - \li \l{audiooutput} - \li \l{audioinput} - \li \l{audiorecorder} - \li \l{audiodevices} - \li \l{spectrum} - \li \l{AudioEngine Example}{Audio Engine} - \li \l{player} - \li \l{Camera Example} - \endlist + \li \l{Qt Multimedia Examples} \endlist */ diff --git a/src/multimedia/doc/src/videooverview.qdoc b/src/multimedia/doc/src/videooverview.qdoc index f0d8de05..45ea87f0 100644 --- a/src/multimedia/doc/src/videooverview.qdoc +++ b/src/multimedia/doc/src/videooverview.qdoc @@ -47,10 +47,10 @@ You can use the \l QMediaPlayer class to decode a video file, and display it using \l QVideoWidget, \l QGraphicsVideoItem, or a custom class. Here's an example of using QVideoWidget: - \snippet doc/src/snippets/multimedia-snippets/video.cpp Video widget + \snippet multimedia-snippets/video.cpp Video widget And an example with QGraphicsVideoItem: - \snippet doc/src/snippets/multimedia-snippets/video.cpp Video graphics item + \snippet multimedia-snippets/video.cpp Video graphics item \section2 Playing Video in QML @@ -77,12 +77,12 @@ processing, while deriving a class from \l QAbstractVideoSurface allows you to receive these frames from \l QMediaPlayer and \l QCamera. -\snippet doc/src/snippets/multimedia-snippets/video.cpp Derived Surface +\snippet multimedia-snippets/video.cpp Derived Surface and with an instance of this surface, \c myVideoSurface, you can set the surface as the \l {QMediaPlayer::setVideoOutput()}{video output} for QMediaPlayer. -\snippet doc/src/snippets/multimedia-snippets/video.cpp Setting surface in player +\snippet multimedia-snippets/video.cpp Setting surface in player Several of the built-in Qt classes offer this functionality as well, so if you decode video in your application, you can present @@ -97,7 +97,7 @@ The following snippet shows a class that has a writable \c videoSurface property and receives frames through a public slot \c onNewVideoContentReceived(). These frames are then presented on the surface set in \c setVideoSurface(). -\snippet doc/src/snippets/multimedia-snippets/video.cpp Video producer +\snippet multimedia-snippets/video.cpp Video producer \section2 Recording Video You can use the \l QMediaRecorder class in conjunction with other @@ -116,7 +116,7 @@ the video frames using this class, and they may arrive at a slightly different time than they are being rendered. Here's an example of installing a video probe while recording the camera: - \snippet doc/src/snippets/multimedia-snippets/media.cpp Video probe + \snippet multimedia-snippets/media.cpp Video probe \section1 Examples diff --git a/src/multimedia/qmediacontrol.cpp b/src/multimedia/qmediacontrol.cpp index 5933ce43..13a66813 100644 --- a/src/multimedia/qmediacontrol.cpp +++ b/src/multimedia/qmediacontrol.cpp @@ -68,14 +68,14 @@ QT_BEGIN_NAMESPACE the \l {QMediaService::requestControl()} member of QMediaService. If the service doesn't implement a control it will instead return a null pointer. - \snippet doc/src/snippets/multimedia-snippets/media.cpp Request control + \snippet multimedia-snippets/media.cpp Request control Alternatively if the IId of the control has been declared using Q_MEDIA_DECLARE_CONTROL the template version of QMediaService::requestControl() can be used to request the service without explicitly passing the IId or using qobject_cast(). - \snippet doc/src/snippets/multimedia-snippets/media.cpp Request control templated + \snippet multimedia-snippets/media.cpp Request control templated Most application code will not interface directly with a media service's controls, instead the QMediaObject which owns the service acts as an @@ -95,7 +95,7 @@ QT_BEGIN_NAMESPACE be requested from QMediaService::requestControl() without explicitly passing the IId. - \snippet doc/src/snippets/multimedia-snippets/media.cpp Request control templated + \snippet multimedia-snippets/media.cpp Request control templated \sa QMediaService::requestControl() */ diff --git a/src/multimedia/qmediaservice.cpp b/src/multimedia/qmediaservice.cpp index c21e1df5..6e68e9d0 100644 --- a/src/multimedia/qmediaservice.cpp +++ b/src/multimedia/qmediaservice.cpp @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE A pointer to media service's QMediaControl implementation can be obtained by passing the control's interface name to the requestControl() function. - \snippet doc/src/snippets/multimedia-snippets/media.cpp Request control + \snippet multimedia-snippets/media.cpp Request control Media objects can use services loaded dynamically from plug-ins or implemented statically within an applications. Plug-in based services diff --git a/src/multimedia/radio/qradiodata.cpp b/src/multimedia/radio/qradiodata.cpp index f6d38082..56922489 100644 --- a/src/multimedia/radio/qradiodata.cpp +++ b/src/multimedia/radio/qradiodata.cpp @@ -78,7 +78,7 @@ namespace You can get a QRadioData instance fromt the \l{QRadioTuner::radioData()}{radioData} property from a QRadioTuner instance. - \snippet doc/src/snippets/multimedia-snippets/media.cpp Radio data setup + \snippet multimedia-snippets/media.cpp Radio data setup Alternatively, you can pass an instance of QRadioTuner to the constructor to QRadioData. diff --git a/src/multimedia/radio/qradiotuner.cpp b/src/multimedia/radio/qradiotuner.cpp index d9d9cb6b..a0cbb585 100644 --- a/src/multimedia/radio/qradiotuner.cpp +++ b/src/multimedia/radio/qradiotuner.cpp @@ -79,7 +79,7 @@ namespace You can control the systems analog radio device using this interface, for example: - \snippet doc/src/snippets/multimedia-snippets/media.cpp Radio tuner + \snippet multimedia-snippets/media.cpp Radio tuner The radio object will emit signals for any changes in state such as: bandChanged(), frequencyChanged(), stereoStatusChanged(), searchingChanged(), diff --git a/src/multimedia/recording/qaudiorecorder.cpp b/src/multimedia/recording/qaudiorecorder.cpp index 25225e5e..71fd219c 100644 --- a/src/multimedia/recording/qaudiorecorder.cpp +++ b/src/multimedia/recording/qaudiorecorder.cpp @@ -66,11 +66,11 @@ QT_BEGIN_NAMESPACE The QAudioRecorder class is a high level media recording class and contains the same functionality as \l QMediaRecorder. - \snippet doc/src/snippets/multimedia-snippets/media.cpp Audio recorder + \snippet multimedia-snippets/media.cpp Audio recorder In addition QAudioRecorder provides functionality for selecting the audio input. - \snippet doc/src/snippets/multimedia-snippets/media.cpp Audio recorder inputs + \snippet multimedia-snippets/media.cpp Audio recorder inputs The \l {audiorecorder}{Audio Recorder} example shows how to use this class in more detail. diff --git a/src/multimedia/recording/qmediaencodersettings.cpp b/src/multimedia/recording/qmediaencodersettings.cpp index 8f8287f4..1c0f5323 100644 --- a/src/multimedia/recording/qmediaencodersettings.cpp +++ b/src/multimedia/recording/qmediaencodersettings.cpp @@ -111,7 +111,7 @@ private: and then passing it to a QMediaRecorder instance using the QMediaRecorder::setEncodingSettings() function. - \snippet doc/src/snippets/multimedia-snippets/media.cpp Audio encoder settings + \snippet multimedia-snippets/media.cpp Audio encoder settings \sa QMediaRecorder, QAudioEncoderSettingsControl */ @@ -425,7 +425,7 @@ private: and then passing it to a QMediaRecorder instance using the QMediaRecorder::setEncodingSettings() function. - \snippet doc/src/snippets/multimedia-snippets/media.cpp Video encoder settings + \snippet multimedia-snippets/media.cpp Video encoder settings \sa QMediaRecorder, QVideoEncoderSettingsControl */ @@ -751,7 +751,7 @@ private: properties and then passing it to a QCameraImageCapture instance using the QCameraImageCapture::setImageSettings() function. - \snippet doc/src/snippets/multimedia-snippets/media.cpp Image encoder settings + \snippet multimedia-snippets/media.cpp Image encoder settings \sa QImageEncoderControl */ diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp index dd303a12..79d70e44 100644 --- a/src/multimedia/recording/qmediarecorder.cpp +++ b/src/multimedia/recording/qmediarecorder.cpp @@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE intended to be used alone but for accessing the media recording functions of other media objects, like QRadioTuner, or QCamera. - \snippet doc/src/snippets/multimedia-snippets/media.cpp Media recorder + \snippet multimedia-snippets/media.cpp Media recorder \sa QAudioRecorder */ From 3bf7a86c07df424df87fa12e224a96cb85596a28 Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Fri, 14 Dec 2012 13:39:53 +0100 Subject: [PATCH 19/33] Doc: Fixed broken links to the Multimedia examples - Updated the example links to reflect the new directory structure for the multimedia examples. - Removed a broken link to audiodecoder example as it doesn't have a qdoc page yet. Change-Id: Ia1169eeb80b4e6b6f92cd070aecbe72ce696bb6a Reviewed-by: Martin Smith Reviewed-by: Jerome Pasion --- src/multimedia/doc/src/multimedia.qdoc | 27 ++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc index b5d967f6..5afa9f6a 100644 --- a/src/multimedia/doc/src/multimedia.qdoc +++ b/src/multimedia/doc/src/multimedia.qdoc @@ -81,51 +81,54 @@ For some quick recipes for specific tasks, look at the overviews above and consu \row \li Playing a sound effect \li - \li \l SoundEffect + \li \li QSoundEffect \row \li Playing low latency audio - \li \l{audiooutput}, \l{spectrum} + \li \l{multimedia/audiooutput}{audioinput}, \l{multimedia/spectrum}{spectrum} \li \li QAudioOutput \row \li Playing encoded audio (MP3, AAC etc) - \li \l{player} + \li \l{multimediawidgets/player}{player} \li \l Audio, \l {MediaPlayer} \li QMediaPlayer \row \li Accessing raw audio input data - \li \l{spectrum}, \l audioinput + \li \l{multimedia/spectrum}{spectrum}, \l {multimedia/audioinput}{audioinput} \li \li QAudioInput \row \li Recording encoded audio data - \li \l audiorecorder + \li \l {multimedia/audiorecorder}{audiorecorder} \li \li QAudioRecorder \row \li Discovering raw audio devices - \li \l audiodevices + \li \l {multimedia/audiodevices}{audiodevices} \li \li QAudioDeviceInfo \row \li Video Playback - \li \l {player}, \l {video/qmlvideo}{qmlvideo}, \l{video/qmlvideofx}{qmlvideofx} + \li \l {multimediawidgets/player}{player}, + \l {multimedia/video/qmlvideo}{qmlvideo}, + \l{multimedia/video/qmlvideofx}{qmlvideofx} \li \l MediaPlayer, \l VideoOutput, \l Video \li QMediaPlayer, QVideoWidget, QGraphicsVideoItem \row \li Video Processing - \li \l {video/qmlvideofx}{qmlvideofx} + \li \l {multimedia/video/qmlvideofx}{qmlvideofx} \li \l {MediaPlayer}, \l VideoOutput \li QMediaPlayer, QAbstractVideoSurface, QVideoFrame \row \li Listening to the radio - \li \l declarative-radio + \li \l {multimedia/declarative-radio}{declarative-radio} \li \l Radio, \l RadioData \li QRadioTuner, QRadioData \row \li Accessing camera viewfinder - \li \l {Camera Example}{camera}, \l declarative-camera + \li \l {Camera Example}{camera}, + \l {multimediawidgets/declarative-camera}{declarative-camera} \li \l Camera, \l VideoOutput \li QCamera, QVideoWidget, QGraphicsVideoItem \row @@ -135,12 +138,12 @@ For some quick recipes for specific tasks, look at the overviews above and consu \li QCamera, QAbstractVideoSurface, QVideoFrame \row \li Capturing photos - \li \l {Camera Example}{camera}, \l declarative-camera + \li \l {Camera Example}{camera}, \l {multimediawidgets/declarative-camera}{declarative-camera} \li \l Camera \li QCamera, QCameraImageCapture \row \li Capturing movies - \li \l {Camera Example}{camera}, \l declarative-camera + \li \l {Camera Example}{camera}, \l {multimediawidgets/declarative-camera}{declarative-camera} \li \l Camera \li QCamera, QMediaRecorder \row From 6fa2f5c4b16d271950d3ec09f100a105fc71f632 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 14 Dec 2012 19:26:41 +0100 Subject: [PATCH 20/33] remove some unnecessary CONFIG additions qt is already added by spec_pre.prf, warn_on by default_pre.prf, and no_private_qt_headers_warning by qt_build_config.prf. Change-Id: Ia5cee420d577dd0ae0120cb2dd430d4ddd29ebcf Reviewed-by: Joerg Bornemann --- examples/multimedia/audiodecoder/audiodecoder.pro | 2 -- src/multimediawidgets/multimediawidgets.pro | 2 -- src/plugins/blackberry/mediaservice/mediaservice.pro | 1 - .../integration/qaudiodecoderbackend/qaudiodecoderbackend.pro | 1 - tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro | 1 - tests/auto/integration/qaudioinput/qaudioinput.pro | 1 - tests/auto/integration/qaudiooutput/qaudiooutput.pro | 1 - tests/auto/integration/qcamerabackend/qcamerabackend.pro | 1 - .../qdeclarativevideooutput/qdeclarativevideooutput.pro | 1 - .../qdeclarativevideooutput_window.pro | 1 - .../integration/qmediaplayerbackend/qmediaplayerbackend.pro | 1 - tests/auto/integration/qml/qml.pro | 2 +- tests/auto/integration/qsound/qsound.pro | 1 - tests/auto/integration/qsoundeffect/qsoundeffect.pro | 1 - tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro | 1 - tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro | 1 - tests/auto/unit/qaudioformat/qaudioformat.pro | 1 - tests/auto/unit/qaudionamespace/qaudionamespace.pro | 1 - tests/auto/unit/qcamera/qcamera.pro | 1 - tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro | 1 - tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro | 1 - tests/auto/unit/qcamerawidgets/qcamerawidgets.pro | 1 - tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro | 1 - tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro | 1 - tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro | 1 - .../unit/qmediabindableinterface/qmediabindableinterface.pro | 1 - .../auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro | 1 - tests/auto/unit/qmediacontent/qmediacontent.pro | 1 - tests/auto/unit/qmediaplaylist/qmediaplaylist.pro | 1 - .../unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro | 1 - tests/auto/unit/qmediapluginloader/qmediapluginloader.pro | 1 - tests/auto/unit/qmediaresource/qmediaresource.pro | 1 - tests/auto/unit/qmediaservice/qmediaservice.pro | 1 - .../mockserviceplugin1/mockserviceplugin1.pro | 1 - .../mockserviceplugin2/mockserviceplugin2.pro | 1 - .../mockserviceplugin3/mockserviceplugin3.pro | 1 - .../mockserviceplugin4/mockserviceplugin4.pro | 1 - tests/auto/unit/qmediaserviceprovider/test/test.pro | 1 - tests/auto/unit/qmediatimerange/qmediatimerange.pro | 1 - .../auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro | 1 - .../auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro | 1 - tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro | 1 - .../qvideoencodersettingscontrol.pro | 1 - tests/auto/unit/qvideoframe/qvideoframe.pro | 1 - tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro | 1 - tests/auto/unit/qvideowidget/qvideowidget.pro | 1 - 46 files changed, 1 insertion(+), 48 deletions(-) diff --git a/examples/multimedia/audiodecoder/audiodecoder.pro b/examples/multimedia/audiodecoder/audiodecoder.pro index 0a09c3cf..4cfb3133 100644 --- a/examples/multimedia/audiodecoder/audiodecoder.pro +++ b/examples/multimedia/audiodecoder/audiodecoder.pro @@ -1,8 +1,6 @@ TEMPLATE = app TARGET = audiodecoder -CONFIG += qt warn_on - HEADERS = \ audiodecoder.h \ wavefilewriter.h diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro index 502c4ccd..d0638dd2 100644 --- a/src/multimediawidgets/multimediawidgets.pro +++ b/src/multimediawidgets/multimediawidgets.pro @@ -7,8 +7,6 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { DEFINES += QT_NO_OPENGL } -CONFIG += no_private_qt_headers_warning - load(qt_module) PRIVATE_HEADERS += \ diff --git a/src/plugins/blackberry/mediaservice/mediaservice.pro b/src/plugins/blackberry/mediaservice/mediaservice.pro index 3a713ee2..ffaed481 100644 --- a/src/plugins/blackberry/mediaservice/mediaservice.pro +++ b/src/plugins/blackberry/mediaservice/mediaservice.pro @@ -1,6 +1,5 @@ TARGET = qtmedia_blackberry QT += multimedia-private gui-private -CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice PLUGIN_CLASS_NAME = BbServicePlugin diff --git a/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro b/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro index f15ee442..80ce0c11 100644 --- a/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro +++ b/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro @@ -1,7 +1,6 @@ TARGET = tst_qaudiodecoderbackend QT += multimedia multimedia-private testlib -CONFIG += no_private_qt_headers_warning # This is more of a system test CONFIG += testcase insignificant_test diff --git a/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro b/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro index 387a1413..69bd792b 100644 --- a/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro +++ b/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro @@ -1,7 +1,6 @@ TARGET = tst_qaudiodeviceinfo QT += core multimedia-private testlib -CONFIG += no_private_qt_headers_warning # This is more of a system test CONFIG += testcase insignificant_test diff --git a/tests/auto/integration/qaudioinput/qaudioinput.pro b/tests/auto/integration/qaudioinput/qaudioinput.pro index bd8ea78c..a3e0ad31 100644 --- a/tests/auto/integration/qaudioinput/qaudioinput.pro +++ b/tests/auto/integration/qaudioinput/qaudioinput.pro @@ -1,7 +1,6 @@ TARGET = tst_qaudioinput QT += core multimedia-private testlib -CONFIG += no_private_qt_headers_warning # This is more of a system test CONFIG += testcase insignificant_test diff --git a/tests/auto/integration/qaudiooutput/qaudiooutput.pro b/tests/auto/integration/qaudiooutput/qaudiooutput.pro index 62f5063b..5933e736 100644 --- a/tests/auto/integration/qaudiooutput/qaudiooutput.pro +++ b/tests/auto/integration/qaudiooutput/qaudiooutput.pro @@ -1,7 +1,6 @@ TARGET = tst_qaudiooutput QT += core multimedia-private testlib -CONFIG += no_private_qt_headers_warning # This is more of a system test CONFIG += testcase diff --git a/tests/auto/integration/qcamerabackend/qcamerabackend.pro b/tests/auto/integration/qcamerabackend/qcamerabackend.pro index 2d3550cf..50da92fb 100644 --- a/tests/auto/integration/qcamerabackend/qcamerabackend.pro +++ b/tests/auto/integration/qcamerabackend/qcamerabackend.pro @@ -1,7 +1,6 @@ TARGET = tst_qcamerabackend QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning # This is more of a system test CONFIG += testcase diff --git a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro index 16a85288..b9be929e 100644 --- a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro +++ b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro @@ -1,7 +1,6 @@ TARGET = tst_qdeclarativevideooutput QT += multimedia-private qml testlib quick -CONFIG += no_private_qt_headers_warning CONFIG += testcase OTHER_FILES += \ diff --git a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro index ba7743e4..3cc5e098 100644 --- a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro +++ b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro @@ -1,7 +1,6 @@ TARGET = tst_qdeclarativevideooutput_window QT += multimedia-private qml testlib quick -CONFIG += no_private_qt_headers_warning CONFIG += testcase OTHER_FILES += \ diff --git a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro index 7dc62b62..79028d88 100644 --- a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro +++ b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro @@ -1,7 +1,6 @@ TARGET = tst_qmediaplayerbackend QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning # This is more of a system test CONFIG += testcase insignificant_test diff --git a/tests/auto/integration/qml/qml.pro b/tests/auto/integration/qml/qml.pro index 63dd0955..cd02af68 100644 --- a/tests/auto/integration/qml/qml.pro +++ b/tests/auto/integration/qml/qml.pro @@ -1,6 +1,6 @@ TEMPLATE=app TARGET=tst_qml -CONFIG += warn_on qmltestcase +CONFIG += qmltestcase SOURCES += tst_qml.cpp diff --git a/tests/auto/integration/qsound/qsound.pro b/tests/auto/integration/qsound/qsound.pro index 0a0ed09c..e2d4434e 100644 --- a/tests/auto/integration/qsound/qsound.pro +++ b/tests/auto/integration/qsound/qsound.pro @@ -1,7 +1,6 @@ TARGET = tst_qsound QT += core multimedia-private testlib -CONFIG += no_private_qt_headers_warning # This is more of a system test CONFIG += testcase diff --git a/tests/auto/integration/qsoundeffect/qsoundeffect.pro b/tests/auto/integration/qsoundeffect/qsoundeffect.pro index 2fffaf71..cb186db2 100644 --- a/tests/auto/integration/qsoundeffect/qsoundeffect.pro +++ b/tests/auto/integration/qsoundeffect/qsoundeffect.pro @@ -1,7 +1,6 @@ TARGET = tst_qsoundeffect QT += core multimedia-private testlib -CONFIG += no_private_qt_headers_warning # This is more of a system test CONFIG += testcase diff --git a/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro b/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro index 22cf7144..dc449358 100644 --- a/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro +++ b/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qabstractvideobuffer QT += core multimedia-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += tst_qabstractvideobuffer.cpp diff --git a/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro b/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro index 4d8f9f1f..62e4c60d 100644 --- a/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro +++ b/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qabstractvideosurface QT += core multimedia-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += tst_qabstractvideosurface.cpp diff --git a/tests/auto/unit/qaudioformat/qaudioformat.pro b/tests/auto/unit/qaudioformat/qaudioformat.pro index b9edca09..40ef06b5 100644 --- a/tests/auto/unit/qaudioformat/qaudioformat.pro +++ b/tests/auto/unit/qaudioformat/qaudioformat.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qaudioformat QT += core multimedia-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += tst_qaudioformat.cpp diff --git a/tests/auto/unit/qaudionamespace/qaudionamespace.pro b/tests/auto/unit/qaudionamespace/qaudionamespace.pro index 40b8107f..78e99dd5 100644 --- a/tests/auto/unit/qaudionamespace/qaudionamespace.pro +++ b/tests/auto/unit/qaudionamespace/qaudionamespace.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qaudionamespace QT += core multimedia-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += tst_qaudionamespace.cpp diff --git a/tests/auto/unit/qcamera/qcamera.pro b/tests/auto/unit/qcamera/qcamera.pro index 1e10098a..1f31c7f1 100644 --- a/tests/auto/unit/qcamera/qcamera.pro +++ b/tests/auto/unit/qcamera/qcamera.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qcamera QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning include (../qmultimedia_common/mock.pri) include (../qmultimedia_common/mockcamera.pri) diff --git a/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro b/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro index 1a8e66a1..e6b43e16 100644 --- a/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro +++ b/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qcameraimagecapture QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += \ tst_qcameraimagecapture.cpp diff --git a/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro b/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro index 3c2b4bb2..6f6aba04 100644 --- a/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro +++ b/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qcameraviewfinder QT += multimedia-private multimediawidgets-private testlib -CONFIG += no_private_qt_headers_warning include (../qmultimedia_common/mock.pri) include (../qmultimedia_common/mockcamera.pri) diff --git a/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro b/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro index adaed0b5..dbab97ab 100644 --- a/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro +++ b/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qcamerawidgets QT += multimedia-private multimediawidgets-private testlib -CONFIG += no_private_qt_headers_warning include (../qmultimedia_common/mock.pri) include (../qmultimedia_common/mockcamera.pri) diff --git a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro index 37c5fd33..6471f7b2 100644 --- a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro +++ b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qdeclarativeaudio QT += multimedia-private qml testlib -CONFIG += no_private_qt_headers_warning HEADERS += \ ../../../../src/imports/multimedia/qdeclarativeaudio_p.h \ diff --git a/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro index 2ab722c7..23948550 100644 --- a/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro +++ b/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qdeclarativevideo QT += multimedia-private qml testlib -CONFIG += no_private_qt_headers_warning HEADERS += \ ../../../../src/imports/multimedia/qdeclarativevideo_p.h \ diff --git a/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro index 81fa546c..ebbac5b6 100644 --- a/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro +++ b/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qgraphicsvideoitem QT += multimedia-private multimediawidgets-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += tst_qgraphicsvideoitem.cpp diff --git a/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro b/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro index 882bd2e5..0e269c1d 100644 --- a/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro +++ b/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qmediabindableinterface QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += \ tst_qmediabindableinterface.cpp diff --git a/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro b/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro index 300d8f5d..32b6276e 100644 --- a/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro +++ b/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qmediacontainercontrol QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += tst_qmediacontainercontrol.cpp diff --git a/tests/auto/unit/qmediacontent/qmediacontent.pro b/tests/auto/unit/qmediacontent/qmediacontent.pro index c42093af..56e0e055 100644 --- a/tests/auto/unit/qmediacontent/qmediacontent.pro +++ b/tests/auto/unit/qmediacontent/qmediacontent.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qmediacontent QT += multimedia-private network testlib -CONFIG += no_private_qt_headers_warning SOURCES += tst_qmediacontent.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro index ed54c478..97dba933 100644 --- a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro +++ b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro @@ -4,7 +4,6 @@ TARGET = tst_qmediaplaylist include (../qmultimedia_common/mockplaylist.pri) QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning HEADERS += \ ../../../../src/plugins/m3u/qm3uhandler.h diff --git a/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro b/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro index 07cc3275..84bbddbc 100644 --- a/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro +++ b/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qmediaplaylistnavigator QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += tst_qmediaplaylistnavigator.cpp diff --git a/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro b/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro index 6c8bd817..36351ce7 100644 --- a/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro +++ b/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qmediapluginloader QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += tst_qmediapluginloader.cpp diff --git a/tests/auto/unit/qmediaresource/qmediaresource.pro b/tests/auto/unit/qmediaresource/qmediaresource.pro index ea75d9df..dcc0bffc 100644 --- a/tests/auto/unit/qmediaresource/qmediaresource.pro +++ b/tests/auto/unit/qmediaresource/qmediaresource.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qmediaresource QT += network multimedia-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += tst_qmediaresource.cpp diff --git a/tests/auto/unit/qmediaservice/qmediaservice.pro b/tests/auto/unit/qmediaservice/qmediaservice.pro index fe6481d2..bdf49b74 100644 --- a/tests/auto/unit/qmediaservice/qmediaservice.pro +++ b/tests/auto/unit/qmediaservice/qmediaservice.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qmediaservice QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += tst_qmediaservice.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro index 843574eb..68dee28a 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro @@ -1,6 +1,5 @@ TARGET = mockserviceplugin1 QT += multimedia-private -CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice PLUGIN_CLASS_NAME = MockServicePlugin1 diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro index 41380f74..98a3ca4a 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro @@ -1,6 +1,5 @@ TARGET = mockserviceplugin2 QT += multimedia-private -CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice PLUGIN_CLASS_NAME = MockServicePlugin2 diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro index 0e5ff0b8..50def293 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro @@ -1,6 +1,5 @@ TARGET = mockserviceplugin3 QT += multimedia-private -CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice PLUGIN_CLASS_NAME = MockServicePlugin3 diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro index 3e83ac92..57b715f5 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro @@ -1,6 +1,5 @@ TARGET = mockserviceplugin4 QT += multimedia-private -CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice PLUGIN_CLASS_NAME = MockServicePlugin4 diff --git a/tests/auto/unit/qmediaserviceprovider/test/test.pro b/tests/auto/unit/qmediaserviceprovider/test/test.pro index c1d584ac..38b6febf 100644 --- a/tests/auto/unit/qmediaserviceprovider/test/test.pro +++ b/tests/auto/unit/qmediaserviceprovider/test/test.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = ../tst_qmediaserviceprovider QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += ../tst_qmediaserviceprovider.cpp diff --git a/tests/auto/unit/qmediatimerange/qmediatimerange.pro b/tests/auto/unit/qmediatimerange/qmediatimerange.pro index 84bb2f57..69af820c 100644 --- a/tests/auto/unit/qmediatimerange/qmediatimerange.pro +++ b/tests/auto/unit/qmediatimerange/qmediatimerange.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qmediatimerange QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += tst_qmediatimerange.cpp diff --git a/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro b/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro index e7ff03f0..44eaf7e6 100644 --- a/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro +++ b/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qmetadatareadercontrol QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += tst_qmetadatareadercontrol.cpp diff --git a/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro b/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro index 91011716..70ca1ebe 100644 --- a/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro +++ b/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qmetadatawritercontrol QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += tst_qmetadatawritercontrol.cpp diff --git a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro index 1098dd16..4408c4f5 100644 --- a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro +++ b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qpaintervideosurface QT += multimedia-private multimediawidgets-private testlib -CONFIG += no_private_qt_headers_warning contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) { QT += opengl } else { diff --git a/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro b/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro index f6c568d8..58800eed 100644 --- a/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro +++ b/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qvideoencodersettingscontrol QT += multimedia-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += \ tst_qvideoencodersettingscontrol.cpp diff --git a/tests/auto/unit/qvideoframe/qvideoframe.pro b/tests/auto/unit/qvideoframe/qvideoframe.pro index 7df5b05d..1e2baa51 100644 --- a/tests/auto/unit/qvideoframe/qvideoframe.pro +++ b/tests/auto/unit/qvideoframe/qvideoframe.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qvideoframe QT += core multimedia-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += tst_qvideoframe.cpp diff --git a/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro b/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro index e923e602..a5c627aa 100644 --- a/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro +++ b/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qvideosurfaceformat QT += core multimedia-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += tst_qvideosurfaceformat.cpp diff --git a/tests/auto/unit/qvideowidget/qvideowidget.pro b/tests/auto/unit/qvideowidget/qvideowidget.pro index e9c1b251..efeb91d3 100644 --- a/tests/auto/unit/qvideowidget/qvideowidget.pro +++ b/tests/auto/unit/qvideowidget/qvideowidget.pro @@ -2,7 +2,6 @@ CONFIG += testcase TARGET = tst_qvideowidget QT += multimedia-private multimediawidgets-private testlib -CONFIG += no_private_qt_headers_warning SOURCES += tst_qvideowidget.cpp From 87d6d6d3c2ec80f484fa4e173f8e54eb32b924f2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 14 Dec 2012 20:02:59 +0100 Subject: [PATCH 21/33] remove obsolete DEPENDPATH assignments qmake now add CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: Iffd78b4c7cf8d048a822b75c481ac380b3d8d0f4 Reviewed-by: Joerg Bornemann --- src/gsttools/gsttools.pro | 1 - src/plugins/wmf/wmf.pro | 1 - src/qtmultimediaquicktools/qtmultimediaquicktools.pro | 1 - 3 files changed, 3 deletions(-) diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro index 8672b1a7..eb1041ca 100644 --- a/src/gsttools/gsttools.pro +++ b/src/gsttools/gsttools.pro @@ -32,7 +32,6 @@ config_resourcepolicy { # Header files must go inside source directory of a module # to be installed by syncqt. INCLUDEPATH += ../multimedia/gsttools_headers/ -DEPENDPATH += ../multimedia/gsttools_headers/ VPATH += ../multimedia/gsttools_headers/ PRIVATE_HEADERS += \ diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro index e16c91e2..fcd2a326 100644 --- a/src/plugins/wmf/wmf.pro +++ b/src/plugins/wmf/wmf.pro @@ -9,7 +9,6 @@ PLUGIN_TYPE=mediaservice PLUGIN_CLASS_NAME = WMFServicePlugin load(qt_plugin) -DEPENDPATH += . INCLUDEPATH += . HEADERS += \ diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro index 9a825fef..da4d0dc1 100644 --- a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro +++ b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro @@ -9,7 +9,6 @@ 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/ -DEPENDPATH += ../multimedia/qtmultimediaquicktools_headers/ PRIVATE_HEADERS += \ ../multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h \ From 0f2fc9ffd93f080a1f1eeb78ac47ca585fa0362a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 14 Dec 2012 20:23:15 +0100 Subject: [PATCH 22/33] remove QT+=widgets from SUBDIRS projects it makes no sense whatsoever Change-Id: I114799dbe35ac31f6d90642ba8c5dbe3fc075604 Reviewed-by: Joerg Bornemann --- examples/multimedia/multimedia.pro | 2 -- examples/multimedia/spectrum/spectrum.pro | 1 - examples/multimediawidgets/multimediawidgets.pro | 2 -- 3 files changed, 5 deletions(-) diff --git a/examples/multimedia/multimedia.pro b/examples/multimedia/multimedia.pro index 020ddaa9..85dc4cd9 100644 --- a/examples/multimedia/multimedia.pro +++ b/examples/multimedia/multimedia.pro @@ -11,8 +11,6 @@ SUBDIRS += audiodecoder audiodevices \ audioinput \ audiooutput \ - - QT += widgets } !isEmpty(QT.gui.name):!isEmpty(QT.qml.name) { diff --git a/examples/multimedia/spectrum/spectrum.pro b/examples/multimedia/spectrum/spectrum.pro index 164ab69b..81006a24 100644 --- a/examples/multimedia/spectrum/spectrum.pro +++ b/examples/multimedia/spectrum/spectrum.pro @@ -4,7 +4,6 @@ TEMPLATE = subdirs # Ensure that library is built before application CONFIG += ordered -QT += widgets !contains(DEFINES, DISABLE_FFT): SUBDIRS += 3rdparty/fftreal SUBDIRS += app diff --git a/examples/multimediawidgets/multimediawidgets.pro b/examples/multimediawidgets/multimediawidgets.pro index 29d07bb3..b14ddd26 100644 --- a/examples/multimediawidgets/multimediawidgets.pro +++ b/examples/multimediawidgets/multimediawidgets.pro @@ -8,8 +8,6 @@ TEMPLATE = subdirs videowidget \ player \ customvideosurface - - QT += widgets } !isEmpty(QT.gui.name):!isEmpty(QT.qml.name) { From d13a7a1f8949c4fab37783064cfba27a49757608 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 14 Dec 2012 14:14:01 +0100 Subject: [PATCH 23/33] Examples: Remove qmlapplicationviewer template. Fix shadow-builds for qmlviewer examples by using qrc files instead. Task-number: QTBUG-28614 Change-Id: Iec993f95166ffd09e8edff552ceca5bc4112d293 Reviewed-by: Oswald Buddenhagen Reviewed-by: hjk --- examples/multimedia/video/qmlvideo/main.cpp | 10 +- .../qmlapplicationviewer.cpp | 129 ------------------ .../qmlapplicationviewer.h | 70 ---------- .../qmlapplicationviewer.pri | 5 - .../multimedia/video/qmlvideo/qmlvideo.pro | 4 +- .../multimedia/video/qmlvideo/qmlvideo.qrc | 47 ++++++- examples/multimedia/video/qmlvideofx/main.cpp | 8 +- .../video/qmlvideofx/qmlvideofx.pro | 4 +- .../video/qmlvideofx/qmlvideofx.qrc | 52 ++++++- .../frequencymonitordeclarative.pri | 2 + .../frequencymonitordeclarative.qrc | 5 + .../performancemonitordeclarative.pri | 1 + .../performancemonitordeclarative.qrc | 5 + 13 files changed, 118 insertions(+), 224 deletions(-) delete mode 100644 examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp delete mode 100644 examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h delete mode 100644 examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri create mode 100644 examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.qrc create mode 100644 examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.qrc diff --git a/examples/multimedia/video/qmlvideo/main.cpp b/examples/multimedia/video/qmlvideo/main.cpp index 86b91482..8230e944 100644 --- a/examples/multimedia/video/qmlvideo/main.cpp +++ b/examples/multimedia/video/qmlvideo/main.cpp @@ -43,9 +43,10 @@ #include #include #include +#include #include #include -#include "qmlapplicationviewer.h" +#include #include "trace.h" #ifdef PERFORMANCEMONITOR_SUPPORT @@ -108,9 +109,10 @@ int main(int argc, char *argv[]) url2 = QUrl::fromLocalFile(source2); } - QmlApplicationViewer viewer; + QQuickView viewer; + viewer.setSource(QUrl("qrc:///qml/qmlvideo/main.qml")); + QObject::connect(viewer.engine(), SIGNAL(quit()), &viewer, SLOT(close())); - viewer.setMainQmlFile(QLatin1String("qml/qmlvideo/main.qml")); QQuickItem *rootObject = viewer.rootObject(); rootObject->setProperty("source1", url1); rootObject->setProperty("source2", url2); @@ -133,7 +135,7 @@ int main(int argc, char *argv[]) QMetaObject::invokeMethod(rootObject, "init"); - viewer.showExpanded(); + viewer.show(); return app.exec(); } diff --git a/examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp deleted file mode 100644 index 2ffc0b21..00000000 --- a/examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp +++ /dev/null @@ -1,129 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qmlapplicationviewer.h" - -#include -#include -#include -#include -#include -#include - -class QmlApplicationViewerPrivate -{ - QmlApplicationViewerPrivate(QQuickView *view_) : view(view_) {} - - QString mainQmlFile; - QQuickView *view; - friend class QmlApplicationViewer; - QString adjustPath(const QString &path); -}; - -QString QmlApplicationViewerPrivate::adjustPath(const QString &path) -{ -#ifdef Q_OS_UNIX -#ifdef Q_OS_MAC - if (!QDir::isAbsolutePath(path)) - return QCoreApplication::applicationDirPath() - + QLatin1String("/../Resources/") + path; -#else - QString pathInInstallDir; - const QString applicationDirPath = QCoreApplication::applicationDirPath(); - pathInInstallDir = QString::fromLatin1("%1/../%2").arg(applicationDirPath, path); - - if (QFileInfo(pathInInstallDir).exists()) - return pathInInstallDir; -#endif -#endif - return path; -} - -QmlApplicationViewer::QmlApplicationViewer(QWindow *parent) - : QQuickView(parent) - , d(new QmlApplicationViewerPrivate(this)) -{ - connect(engine(), SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit())); - setResizeMode(QQuickView::SizeRootObjectToView); -} - -QmlApplicationViewer::QmlApplicationViewer(QQuickView *view, QWindow *parent) - : QQuickView(parent) - , d(new QmlApplicationViewerPrivate(view)) -{ - connect(view->engine(), SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit())); - view->setResizeMode(QQuickView::SizeRootObjectToView); -} - -QmlApplicationViewer::~QmlApplicationViewer() -{ - delete d; -} - -QmlApplicationViewer *QmlApplicationViewer::create() -{ - return new QmlApplicationViewer(); -} - -void QmlApplicationViewer::setMainQmlFile(const QString &file) -{ - d->mainQmlFile = d->adjustPath(file); - d->view->setSource(QUrl::fromLocalFile(d->mainQmlFile)); -} - -void QmlApplicationViewer::addImportPath(const QString &path) -{ - d->view->engine()->addImportPath(d->adjustPath(path)); -} - -void QmlApplicationViewer::showExpanded() -{ -#if defined(Q_WS_SIMULATOR) - d->view->showFullScreen(); -#else - d->view->show(); -#endif -} - -QGuiApplication *createApplication(int &argc, char **argv) -{ - return new QGuiApplication(argc, argv); -} diff --git a/examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h b/examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h deleted file mode 100644 index a4eabdba..00000000 --- a/examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QMLAPPLICATIONVIEWER_H -#define QMLAPPLICATIONVIEWER_H - -#include -#include - -class QmlApplicationViewer : public QQuickView -{ - Q_OBJECT - -public: - explicit QmlApplicationViewer(QWindow *parent = 0); - virtual ~QmlApplicationViewer(); - - static QmlApplicationViewer *create(); - - void setMainQmlFile(const QString &file); - void addImportPath(const QString &path); - - void showExpanded(); - -private: - explicit QmlApplicationViewer(QQuickView *view, QWindow *parent); - class QmlApplicationViewerPrivate *d; -}; - -QGuiApplication *createApplication(int &argc, char **argv); - -#endif // QMLAPPLICATIONVIEWER_H diff --git a/examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri b/examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri deleted file mode 100644 index 75d66c36..00000000 --- a/examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri +++ /dev/null @@ -1,5 +0,0 @@ -QT += qml quick - -SOURCES += $$PWD/qmlapplicationviewer.cpp -HEADERS += $$PWD/qmlapplicationviewer.h -INCLUDEPATH += $$PWD diff --git a/examples/multimedia/video/qmlvideo/qmlvideo.pro b/examples/multimedia/video/qmlvideo/qmlvideo.pro index 78c6f054..3ea513d3 100644 --- a/examples/multimedia/video/qmlvideo/qmlvideo.pro +++ b/examples/multimedia/video/qmlvideo/qmlvideo.pro @@ -1,6 +1,8 @@ TEMPLATE = app TARGET = qmlvideo +QT += quick + LOCAL_SOURCES = main.cpp LOCAL_HEADERS = trace.h @@ -11,8 +13,6 @@ RESOURCES += qmlvideo.qrc SNIPPETS_PATH = ../snippets include($$SNIPPETS_PATH/performancemonitor/performancemonitordeclarative.pri) -include(qmlapplicationviewer/qmlapplicationviewer.pri) - target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/video/qmlvideo INSTALLS += target diff --git a/examples/multimedia/video/qmlvideo/qmlvideo.qrc b/examples/multimedia/video/qmlvideo/qmlvideo.qrc index 4896b336..5bf2df8a 100644 --- a/examples/multimedia/video/qmlvideo/qmlvideo.qrc +++ b/examples/multimedia/video/qmlvideo/qmlvideo.qrc @@ -1,5 +1,5 @@ - + images/leaves.jpg images/close.png images/folder.png @@ -8,5 +8,50 @@ images/up.png images/progress_handle.svg images/progress_handle_pressed.svg + qml/qmlvideo/Button.qml + qml/qmlvideo/CameraBasic.qml + qml/qmlvideo/CameraDrag.qml + qml/qmlvideo/CameraDummy.qml + qml/qmlvideo/CameraFullScreen.qml + qml/qmlvideo/CameraFullScreenInverted.qml + qml/qmlvideo/CameraItem.qml + qml/qmlvideo/CameraMove.qml + qml/qmlvideo/CameraOverlay.qml + qml/qmlvideo/CameraResize.qml + qml/qmlvideo/CameraRotate.qml + qml/qmlvideo/CameraSpin.qml + qml/qmlvideo/Content.qml + qml/qmlvideo/DisableScreenSaver.qml + qml/qmlvideo/ErrorDialog.qml + qml/qmlvideo/FileBrowser.qml + qml/qmlvideo/main.qml + qml/qmlvideo/Scene.qml + qml/qmlvideo/SceneBasic.qml + qml/qmlvideo/SceneDrag.qml + qml/qmlvideo/SceneFullScreen.qml + qml/qmlvideo/SceneFullScreenInverted.qml + qml/qmlvideo/SceneMove.qml + qml/qmlvideo/SceneMulti.qml + qml/qmlvideo/SceneOverlay.qml + qml/qmlvideo/SceneResize.qml + qml/qmlvideo/SceneRotate.qml + qml/qmlvideo/SceneSelectionPanel.qml + qml/qmlvideo/SceneSpin.qml + qml/qmlvideo/SeekControl.qml + qml/qmlvideo/VideoBasic.qml + qml/qmlvideo/VideoDrag.qml + qml/qmlvideo/VideoDummy.qml + qml/qmlvideo/VideoFillMode.qml + qml/qmlvideo/VideoFullScreen.qml + qml/qmlvideo/VideoFullScreenInverted.qml + qml/qmlvideo/VideoItem.qml + qml/qmlvideo/VideoMetadata.qml + qml/qmlvideo/VideoMove.qml + qml/qmlvideo/VideoOverlay.qml + qml/qmlvideo/VideoPlaybackRate.qml + qml/qmlvideo/VideoResize.qml + qml/qmlvideo/VideoRotate.qml + qml/qmlvideo/VideoSeek.qml + qml/qmlvideo/VideoSpin.qml diff --git a/examples/multimedia/video/qmlvideofx/main.cpp b/examples/multimedia/video/qmlvideofx/main.cpp index 92e476a1..9f47a9c1 100644 --- a/examples/multimedia/video/qmlvideofx/main.cpp +++ b/examples/multimedia/video/qmlvideofx/main.cpp @@ -44,8 +44,8 @@ #include #include #include +#include #include "filereader.h" -#include "qmlapplicationviewer.h" #include "trace.h" #ifdef SMALL_SCREEN_LAYOUT @@ -97,9 +97,9 @@ int main(int argc, char *argv[]) } } - QmlApplicationViewer viewer; + QQuickView viewer; - viewer.setMainQmlFile(QLatin1String("qml/qmlvideofx/") + MainQmlFile); + viewer.setSource(QLatin1String("qrc:///qml/qmlvideofx/") + MainQmlFile); QQuickItem *rootObject = viewer.rootObject(); rootObject->setProperty("fileName", fileName); viewer.rootObject()->setProperty("volume", volume); @@ -136,7 +136,7 @@ int main(int argc, char *argv[]) #ifdef SMALL_SCREEN_PHYSICAL viewer.showFullScreen(); #else - viewer.showExpanded(); + viewer.show(); #endif // Delay invocation of init until the event loop has started, to work around diff --git a/examples/multimedia/video/qmlvideofx/qmlvideofx.pro b/examples/multimedia/video/qmlvideofx/qmlvideofx.pro index 7779565f..629c0bdc 100644 --- a/examples/multimedia/video/qmlvideofx/qmlvideofx.pro +++ b/examples/multimedia/video/qmlvideofx/qmlvideofx.pro @@ -1,6 +1,8 @@ TEMPLATE = app TARGET = qmlvideofx +QT += quick + LOCAL_SOURCES = filereader.cpp main.cpp LOCAL_HEADERS = filereader.h trace.h @@ -17,7 +19,5 @@ maemo6: { DEFINES += SMALL_SCREEN_PHYSICAL } -include(qmlapplicationviewer/qmlapplicationviewer.pri) - target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/video/qmlvideofx INSTALLS += target diff --git a/examples/multimedia/video/qmlvideofx/qmlvideofx.qrc b/examples/multimedia/video/qmlvideofx/qmlvideofx.qrc index 6ca4ef54..0b39099a 100644 --- a/examples/multimedia/video/qmlvideofx/qmlvideofx.qrc +++ b/examples/multimedia/video/qmlvideofx/qmlvideofx.qrc @@ -1,10 +1,48 @@ - - images/close.png - images/folder.png - images/titlebar.png - images/titlebar.sci - images/up.png - images/qt-logo.png + + images/close.png + images/folder.png + images/titlebar.png + images/titlebar.sci + images/up.png + images/qt-logo.png + qml/qmlvideofx/Button.qml + qml/qmlvideofx/Content.qml + qml/qmlvideofx/ContentCamera.qml + qml/qmlvideofx/ContentImage.qml + qml/qmlvideofx/ContentVideo.qml + qml/qmlvideofx/DisableScreenSaver.qml + qml/qmlvideofx/Divider.qml + qml/qmlvideofx/Effect.qml + qml/qmlvideofx/EffectBillboard.qml + qml/qmlvideofx/EffectBlackAndWhite.qml + qml/qmlvideofx/EffectEmboss.qml + qml/qmlvideofx/EffectGaussianBlur.qml + qml/qmlvideofx/EffectGlow.qml + qml/qmlvideofx/EffectIsolate.qml + qml/qmlvideofx/EffectMagnify.qml + qml/qmlvideofx/EffectPageCurl.qml + qml/qmlvideofx/EffectPassThrough.qml + qml/qmlvideofx/EffectPixelate.qml + qml/qmlvideofx/EffectPosterize.qml + qml/qmlvideofx/EffectRipple.qml + qml/qmlvideofx/EffectSelectionPanel.qml + qml/qmlvideofx/EffectSepia.qml + qml/qmlvideofx/EffectSharpen.qml + qml/qmlvideofx/EffectShockwave.qml + qml/qmlvideofx/EffectSobelEdgeDetection1.qml + qml/qmlvideofx/EffectSobelEdgeDetection2.qml + qml/qmlvideofx/EffectTiltShift.qml + qml/qmlvideofx/EffectToon.qml + qml/qmlvideofx/EffectVignette.qml + qml/qmlvideofx/EffectWarhol.qml + qml/qmlvideofx/EffectWobble.qml + qml/qmlvideofx/FileBrowser.qml + qml/qmlvideofx/FileOpen.qml + qml/qmlvideofx/HintedMouseArea.qml + qml/qmlvideofx/main-largescreen.qml + qml/qmlvideofx/main-smallscreen.qml + qml/qmlvideofx/ParameterPanel.qml + qml/qmlvideofx/Slider.qml diff --git a/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.pri b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.pri index 90a111cd..071b7286 100644 --- a/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.pri +++ b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.pri @@ -1,3 +1,5 @@ include($$PWD/frequencymonitor.pri) QT += qml + SOURCES += $$PWD/frequencymonitordeclarative.cpp +RESOURCES += $$PWD/frequencymonitordeclarative.qrc diff --git a/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.qrc b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.qrc new file mode 100644 index 00000000..48e60cf1 --- /dev/null +++ b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.qrc @@ -0,0 +1,5 @@ + + + qml/frequencymonitor/FrequencyItem.qml + + diff --git a/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.pri b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.pri index cf32c4ed..9a18e35e 100644 --- a/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.pri +++ b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.pri @@ -3,3 +3,4 @@ include($$PWD/performancemonitor.pri) HEADERS += $$PWD/performancemonitordeclarative.h SOURCES += $$PWD/performancemonitordeclarative.cpp +RESOURCES += $$PWD/performancemonitordeclarative.qrc diff --git a/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.qrc b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.qrc new file mode 100644 index 00000000..9ec54a3e --- /dev/null +++ b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.qrc @@ -0,0 +1,5 @@ + + + qml/performancemonitor/PerformanceItem.qml + + From 404b7dbe3fce3881990fc5a1bd908c72750f6ad9 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Wed, 19 Dec 2012 00:11:29 +0800 Subject: [PATCH 24/33] Example: Notify user of errors Before, the widget simply failed silently, which gave the impression that the widget is broken. Change-Id: I8ab7ed0e0a62f9643791b6f4732f7f3b2cd7521a Reviewed-by: Martin Smith --- .../multimediawidgets/videowidget/videoplayer.cpp | 15 ++++++++++++++- .../multimediawidgets/videowidget/videoplayer.h | 3 +++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/examples/multimediawidgets/videowidget/videoplayer.cpp b/examples/multimediawidgets/videowidget/videoplayer.cpp index d961a63f..4083543e 100644 --- a/examples/multimediawidgets/videowidget/videoplayer.cpp +++ b/examples/multimediawidgets/videowidget/videoplayer.cpp @@ -49,6 +49,7 @@ VideoPlayer::VideoPlayer(QWidget *parent) , mediaPlayer(0, QMediaPlayer::VideoSurface) , playButton(0) , positionSlider(0) + , errorLabel(0) { QVideoWidget *videoWidget = new QVideoWidget; @@ -68,6 +69,9 @@ VideoPlayer::VideoPlayer(QWidget *parent) connect(positionSlider, SIGNAL(sliderMoved(int)), this, SLOT(setPosition(int))); + errorLabel = new QLabel; + errorLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); + QBoxLayout *controlLayout = new QHBoxLayout; controlLayout->setMargin(0); controlLayout->addWidget(openButton); @@ -77,6 +81,7 @@ VideoPlayer::VideoPlayer(QWidget *parent) QBoxLayout *layout = new QVBoxLayout; layout->addWidget(videoWidget); layout->addLayout(controlLayout); + layout->addWidget(errorLabel); setLayout(layout); @@ -85,6 +90,7 @@ VideoPlayer::VideoPlayer(QWidget *parent) this, SLOT(mediaStateChanged(QMediaPlayer::State))); connect(&mediaPlayer, SIGNAL(positionChanged(qint64)), this, SLOT(positionChanged(qint64))); connect(&mediaPlayer, SIGNAL(durationChanged(qint64)), this, SLOT(durationChanged(qint64))); + connect(&mediaPlayer, SIGNAL(error(QMediaPlayer::Error)), this, SLOT(handleError())); } VideoPlayer::~VideoPlayer() @@ -93,11 +99,12 @@ VideoPlayer::~VideoPlayer() void VideoPlayer::openFile() { + errorLabel->setText(""); + QString fileName = QFileDialog::getOpenFileName(this, tr("Open Movie"),QDir::homePath()); if (!fileName.isEmpty()) { mediaPlayer.setMedia(QUrl::fromLocalFile(fileName)); - playButton->setEnabled(true); } } @@ -140,3 +147,9 @@ void VideoPlayer::setPosition(int position) { mediaPlayer.setPosition(position); } + +void VideoPlayer::handleError() +{ + playButton->setEnabled(false); + errorLabel->setText("Error: " + mediaPlayer.errorString()); +} diff --git a/examples/multimediawidgets/videowidget/videoplayer.h b/examples/multimediawidgets/videowidget/videoplayer.h index ddad1872..0bd720bf 100644 --- a/examples/multimediawidgets/videowidget/videoplayer.h +++ b/examples/multimediawidgets/videowidget/videoplayer.h @@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE class QAbstractButton; class QSlider; +class QLabel; QT_END_NAMESPACE class VideoPlayer : public QWidget @@ -67,11 +68,13 @@ private slots: void positionChanged(qint64 position); void durationChanged(qint64 duration); void setPosition(int position); + void handleError(); private: QMediaPlayer mediaPlayer; QAbstractButton *playButton; QSlider *positionSlider; + QLabel *errorLabel; }; #endif From 5739d43eef89e415974ca64fb348371f9f8659c7 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 20 Dec 2012 11:49:20 +0200 Subject: [PATCH 25/33] Add qmake generated files to .gitignore. Add source files generated by qmake for automatic static plugin imports to .gitignore. Change-Id: I38977c5d410e1dc9f424de39c88a9fcd281d1e69 Reviewed-by: Oswald Buddenhagen --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 3c1e1d30..464f1814 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,6 @@ src/multimediawidgets/qtmultimediawidgetsversion.h tst_* !tst_*.cpp tests/auto/cmake/build + +# Generated static plugin import sources +*_plugin_import.cpp From 416168db8a9bb54614117469a43f751a401de854 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 18 Dec 2012 15:11:44 +0100 Subject: [PATCH 26/33] Polish and fix qmlvideofx example Change-Id: I30f6d7d2af784ba018a659a16aceb4876a4b1be6 Reviewed-by: hjk --- examples/multimedia/video/qmlvideo/main.cpp | 6 +-- .../video/qmlvideofx/filereader.cpp | 30 +++---------- .../multimedia/video/qmlvideofx/filereader.h | 2 +- examples/multimedia/video/qmlvideofx/main.cpp | 8 ++-- .../qmlvideofx/qml/qmlvideofx/Effect.qml | 2 +- .../qml/qmlvideofx/EffectBillboard.qml | 2 +- .../qml/qmlvideofx/EffectBlackAndWhite.qml | 2 +- .../qml/qmlvideofx/EffectEmboss.qml | 2 +- .../qml/qmlvideofx/EffectGaussianBlur.qml | 4 +- .../qmlvideofx/qml/qmlvideofx/EffectGlow.qml | 2 +- .../qml/qmlvideofx/EffectIsolate.qml | 2 +- .../qml/qmlvideofx/EffectMagnify.qml | 2 +- .../qml/qmlvideofx/EffectPageCurl.qml | 2 +- .../qml/qmlvideofx/EffectPixelate.qml | 2 +- .../qml/qmlvideofx/EffectPosterize.qml | 2 +- .../qml/qmlvideofx/EffectRipple.qml | 2 +- .../qmlvideofx/qml/qmlvideofx/EffectSepia.qml | 2 +- .../qml/qmlvideofx/EffectSharpen.qml | 2 +- .../qml/qmlvideofx/EffectShockwave.qml | 2 +- .../qmlvideofx/EffectSobelEdgeDetection1.qml | 2 +- .../qmlvideofx/EffectSobelEdgeDetection2.qml | 2 +- .../qml/qmlvideofx/EffectTiltShift.qml | 2 +- .../qmlvideofx/qml/qmlvideofx/EffectToon.qml | 2 +- .../qml/qmlvideofx/EffectVignette.qml | 2 +- .../qml/qmlvideofx/EffectWarhol.qml | 2 +- .../qml/qmlvideofx/EffectWobble.qml | 2 +- .../video/qmlvideofx/qmlvideofx.pro | 10 ++--- .../video/qmlvideofx/qmlvideofx.qrc | 23 ++++++++++ examples/multimedia/video/qmlvideofx/trace.h | 12 ++--- .../frequencymonitor/frequencymonitor.cpp | 26 +++++------ .../frequencymonitor/frequencymonitor.h | 7 +-- .../performancemonitor/performancemonitor.cpp | 44 +++++++++---------- .../performancemonitor/performancemonitor.h | 31 +++++++------ 33 files changed, 122 insertions(+), 123 deletions(-) diff --git a/examples/multimedia/video/qmlvideo/main.cpp b/examples/multimedia/video/qmlvideo/main.cpp index 8230e944..ac26c983 100644 --- a/examples/multimedia/video/qmlvideo/main.cpp +++ b/examples/multimedia/video/qmlvideo/main.cpp @@ -69,8 +69,8 @@ int main(int argc, char *argv[]) QStringList args = app.arguments(); PerformanceMonitor::State performanceMonitorState; bool sourceIsUrl = false; - for (int i=1; i -#include -#include -#include -#include -QString adjustPath(const QString &path) -{ -#ifdef Q_OS_UNIX -#ifdef Q_OS_MAC - if (!QDir::isAbsolutePath(path)) - return QCoreApplication::applicationDirPath() - + QLatin1String("/../Resources/") + path; -#else - QString pathInInstallDir; - const QString applicationDirPath = QCoreApplication::applicationDirPath(); - pathInInstallDir = QString::fromLatin1("%1/../%2").arg(applicationDirPath, path); - - if (QFileInfo(pathInInstallDir).exists()) - return pathInInstallDir; -#endif -#endif - return path; -} +#include +#include +#include +#include +#include QString FileReader::readFile(const QString &fileName) { qtTrace() << "FileReader::readFile" << "fileName" << fileName; QString content; - QFile file(adjustPath(fileName)); + QFile file(fileName); if (file.open(QIODevice::ReadOnly)) { QTextStream stream(&file); content = stream.readAll(); diff --git a/examples/multimedia/video/qmlvideofx/filereader.h b/examples/multimedia/video/qmlvideofx/filereader.h index 44393b1c..443a2a2f 100644 --- a/examples/multimedia/video/qmlvideofx/filereader.h +++ b/examples/multimedia/video/qmlvideofx/filereader.h @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include class FileReader : public QObject { diff --git a/examples/multimedia/video/qmlvideofx/main.cpp b/examples/multimedia/video/qmlvideofx/main.cpp index 9f47a9c1..056c274e 100644 --- a/examples/multimedia/video/qmlvideofx/main.cpp +++ b/examples/multimedia/video/qmlvideofx/main.cpp @@ -72,17 +72,17 @@ int main(int argc, char *argv[]) #ifdef PERFORMANCEMONITOR_SUPPORT PerformanceMonitor::State performanceMonitorState; #endif - for (int i=1; iqml/qmlvideofx/main-smallscreen.qml qml/qmlvideofx/ParameterPanel.qml qml/qmlvideofx/Slider.qml + shaders/billboard.fsh + shaders/blackandwhite.fsh + shaders/emboss.fsh + shaders/gaussianblur_h.fsh + shaders/gaussianblur_v.fsh + shaders/glow.fsh + shaders/isolate.fsh + shaders/magnify.fsh + shaders/pagecurl.fsh + shaders/pixelate.fsh + shaders/posterize.fsh + shaders/ripple.fsh + shaders/selectionpanel.fsh + shaders/sepia.fsh + shaders/sharpen.fsh + shaders/shockwave.fsh + shaders/sobeledgedetection1.fsh + shaders/sobeledgedetection2.fsh + shaders/tiltshift.fsh + shaders/toon.fsh + shaders/vignette.fsh + shaders/warhol.fsh + shaders/wobble.fsh diff --git a/examples/multimedia/video/qmlvideofx/trace.h b/examples/multimedia/video/qmlvideofx/trace.h index 73095f59..c5332d5d 100644 --- a/examples/multimedia/video/qmlvideofx/trace.h +++ b/examples/multimedia/video/qmlvideofx/trace.h @@ -42,7 +42,7 @@ #ifndef TRACE_H #define TRACE_H -#include +#include #define ENABLE_TRACE //#define VERBOSE_TRACE @@ -53,7 +53,7 @@ class NullDebug { public: template - NullDebug& operator<<(const T&) { return *this; } + NullDebug &operator<<(const T &) { return *this; } }; inline NullDebug nullDebug() { return NullDebug(); } @@ -68,18 +68,12 @@ struct PtrWrapper } // namespace Trace template -inline QDebug& operator<<(QDebug &debug, const Trace::PtrWrapper &wrapper) +inline QDebug &operator<<(QDebug &debug, const Trace::PtrWrapper &wrapper) { debug.nospace() << "[" << (void*)wrapper.m_ptr << "]"; return debug.space(); } -template -inline const void *qtVoidPtr(const T *ptr) -{ return static_cast(ptr); } - -#define qtThisPtr() qtVoidPtr(this) - #ifdef ENABLE_TRACE inline QDebug qtTrace() { return qDebug() << "[qmlvideofx]"; } # ifdef VERBOSE_TRACE diff --git a/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp index 1d44f129..568bbc79 100644 --- a/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp +++ b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp @@ -40,11 +40,11 @@ ****************************************************************************/ #include "frequencymonitor.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include //#define VERBOSE_TRACE @@ -61,6 +61,7 @@ static const int DefaultTraceInterval = 0; class FrequencyMonitorPrivate : public QObject { Q_OBJECT + public: FrequencyMonitorPrivate(FrequencyMonitor *parent); void calculateInstantaneousFrequency(); @@ -116,16 +117,16 @@ void FrequencyMonitorPrivate::calculateInstantaneousFrequency() m_stalledTimer->start(3 * ms); if (m_instantaneousFrequency) q_ptr->setActive(true); - q_ptr->emit instantaneousFrequencyChanged(m_instantaneousFrequency); - q_ptr->emit frequencyChanged(); + emit q_ptr->instantaneousFrequencyChanged(m_instantaneousFrequency); + emit q_ptr->frequencyChanged(); } void FrequencyMonitorPrivate::calculateAverageFrequency() { const qint64 ms = m_averageElapsed.restart(); m_averageFrequency = qreal(m_count * 1000) / ms; - q_ptr->emit averageFrequencyChanged(m_averageFrequency); - q_ptr->emit frequencyChanged(); + emit q_ptr->averageFrequencyChanged(m_averageFrequency); + emit q_ptr->frequencyChanged(); m_count = 0; } @@ -134,14 +135,13 @@ void FrequencyMonitorPrivate::stalled() if (m_instantaneousFrequency) { qtVerboseTrace() << "FrequencyMonitor::stalled"; m_instantaneousFrequency = 0; - q_ptr->emit instantaneousFrequencyChanged(m_instantaneousFrequency); - q_ptr->emit frequencyChanged(); + emit q_ptr->instantaneousFrequencyChanged(m_instantaneousFrequency); + emit q_ptr->frequencyChanged(); } } FrequencyMonitor::FrequencyMonitor(QObject *parent) : QObject(parent) -, d_ptr(0) { d_ptr = new FrequencyMonitorPrivate(this); qtTrace() << "FrequencyMonitor::FrequencyMonitor"; @@ -152,7 +152,7 @@ FrequencyMonitor::~FrequencyMonitor() } -const QString &FrequencyMonitor::label() const +QString FrequencyMonitor::label() const { return d_func()->m_label; } diff --git a/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.h b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.h index 1efd8b3a..f34646f9 100644 --- a/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.h +++ b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.h @@ -42,8 +42,8 @@ #ifndef FREQUENCYMONITOR_H #define FREQUENCYMONITOR_H -#include -#include +#include +#include class FrequencyMonitorPrivate; @@ -64,13 +64,14 @@ class FrequencyMonitor : public QObject Q_PROPERTY(int traceInterval READ traceInterval WRITE setTraceInterval NOTIFY traceIntervalChanged) Q_PROPERTY(qreal instantaneousFrequency READ instantaneousFrequency NOTIFY instantaneousFrequencyChanged) Q_PROPERTY(qreal averageFrequency READ averageFrequency NOTIFY averageFrequencyChanged) + public: FrequencyMonitor(QObject *parent = 0); ~FrequencyMonitor(); static void qmlRegisterType(); - const QString &label() const; + QString label() const; bool active() const; int samplingInterval() const; int traceInterval() const; diff --git a/examples/multimedia/video/snippets/performancemonitor/performancemonitor.cpp b/examples/multimedia/video/snippets/performancemonitor/performancemonitor.cpp index 9a7e060b..07c83485 100644 --- a/examples/multimedia/video/snippets/performancemonitor/performancemonitor.cpp +++ b/examples/multimedia/video/snippets/performancemonitor/performancemonitor.cpp @@ -43,27 +43,27 @@ namespace PerformanceMonitor { - bool parseArgument(const QString &arg, State &state) - { - bool result = false; - if ("-log-perf" == arg) { - state.logging = true; - state.valid = true; - result = true; - } else if ("-no-log-perf" == arg) { - state.logging = false; - state.valid = true; - result = true; - } else if ("-show-perf" == arg) { - state.visible = true; - state.valid = true; - result = true; - } else if ("-hide-perf" == arg) { - state.visible = false; - state.valid = true; - result = true; - } - return result; +bool State::parseArgument(const QByteArray &arg) +{ + bool result = false; + if (arg == "-log-perf") { + logging = true; + valid = true; + result = true; + } else if (arg == "-no-log-perf") { + logging = false; + valid = true; + result = true; + } else if (arg == "-show-perf") { + visible = true; + valid = true; + result = true; + } else if (arg == "-hide-perf") { + visible = false; + valid = true; + result = true; } - + return result; } + +} // namespace PerformanceMonitor diff --git a/examples/multimedia/video/snippets/performancemonitor/performancemonitor.h b/examples/multimedia/video/snippets/performancemonitor/performancemonitor.h index d87d71ea..f1a443e0 100644 --- a/examples/multimedia/video/snippets/performancemonitor/performancemonitor.h +++ b/examples/multimedia/video/snippets/performancemonitor/performancemonitor.h @@ -42,24 +42,27 @@ #ifndef PERFORMANCEMONITOR_H #define PERFORMANCEMONITOR_H -#include +#include namespace PerformanceMonitor { - struct State { - bool valid; - bool logging; - bool visible; - State() : valid(true), logging(false), visible(true) { } - State(bool l, bool v) : valid(true), logging(l), visible(v) { } - bool operator==(const State &other) const - { return logging == other.logging && visible == other.visible; } - bool operator!=(const State &other) const - { return logging != other.logging || visible != other.visible; } - }; +struct State +{ + State() : valid(true), logging(false), visible(true) { } + State(bool l, bool v) : valid(true), logging(l), visible(v) { } + bool operator==(const State &other) const + { return logging == other.logging && visible == other.visible; } + bool operator!=(const State &other) const + { return logging != other.logging || visible != other.visible; } - bool parseArgument(const QString &arg, State &state); -} + bool parseArgument(const QByteArray &arg); + + bool valid; + bool logging; + bool visible; +}; + +} // namespace PerformanceMonitor #endif // PERFORMANCEMONITOR_H From d8426bbf71d30f69b506a5e0148cafc05c79bae9 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Thu, 20 Dec 2012 16:19:59 +0100 Subject: [PATCH 27/33] WMF: Fixed incorrect QMediaPlayer volume reporting. Task-number: QTBUG-26621 Change-Id: Id70a68ad61fd7d68f4ee277f33a54bd9c00c05d0 Reviewed-by: Jason Barron --- src/plugins/wmf/player/mfplayersession.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/wmf/player/mfplayersession.cpp b/src/plugins/wmf/player/mfplayersession.cpp index 1eb91c20..d9ff0e7c 100644 --- a/src/plugins/wmf/player/mfplayersession.cpp +++ b/src/plugins/wmf/player/mfplayersession.cpp @@ -413,7 +413,7 @@ MFPlayerSession::MFPlayerSession(MFPlayerService *playerService) , m_hCloseEvent(0) , m_closing(false) , m_pendingRate(1) - , m_volume(1) + , m_volume(100) , m_muted(false) , m_status(QMediaPlayer::NoMedia) , m_scrubbing(false) @@ -1640,7 +1640,7 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent) } if (SUCCEEDED(MFGetService(m_session, MR_POLICY_VOLUME_SERVICE, IID_PPV_ARGS(&m_volumeControl)))) { - m_volumeControl->SetMasterVolume(m_volume); + m_volumeControl->SetMasterVolume(m_volume * 0.01f); m_volumeControl->SetMute(m_muted); } @@ -1692,9 +1692,10 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent) if (m_volumeControl) { float currentVolume = 1; if (SUCCEEDED(m_volumeControl->GetMasterVolume(¤tVolume))) { - if (currentVolume != m_volume) { - m_volume = currentVolume; - emit volumeChanged(int(m_volume * 100)); + int scaledVolume = currentVolume * 100; + if (scaledVolume != m_volume) { + m_volume = scaledVolume; + emit volumeChanged(scaledVolume); } } BOOL currentMuted = FALSE; From b0b78d200bf6d1366cad9f0152cb515e6241d4bd Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 20 Dec 2012 16:51:11 +0100 Subject: [PATCH 28/33] Use qrc to deploy qml files in declarative-camera examples Make the declarative-camera example working in shadow builds by including the Qt Quick assets via a .qrc file. Change-Id: Iea56e7d69558503abdf15a600a6ce21ea90ee99a Reviewed-by: Oswald Buddenhagen --- .../declarative-camera/declarative-camera.pro | 1 + .../declarative-camera/declarative-camera.qrc | 26 +++++++++++++++++++ .../declarative-camera/qmlcamera.cpp | 3 +-- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 examples/multimediawidgets/declarative-camera/declarative-camera.qrc diff --git a/examples/multimediawidgets/declarative-camera/declarative-camera.pro b/examples/multimediawidgets/declarative-camera/declarative-camera.pro index c52a1d1e..5fb0a1b5 100644 --- a/examples/multimediawidgets/declarative-camera/declarative-camera.pro +++ b/examples/multimediawidgets/declarative-camera/declarative-camera.pro @@ -4,6 +4,7 @@ TARGET=declarative-camera QT += quick qml multimedia SOURCES += qmlcamera.cpp +RESOURCES += declarative-camera.qrc target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/declarative-camera INSTALLS += target diff --git a/examples/multimediawidgets/declarative-camera/declarative-camera.qrc b/examples/multimediawidgets/declarative-camera/declarative-camera.qrc new file mode 100644 index 00000000..d99b86c0 --- /dev/null +++ b/examples/multimediawidgets/declarative-camera/declarative-camera.qrc @@ -0,0 +1,26 @@ + + + PhotoPreview.qml + ZoomControl.qml + VideoCaptureControls.qml + VideoPreview.qml + FocusButton.qml + PhotoCaptureControls.qml + declarative-camera.qml + CameraPropertyPopup.qml + CameraPropertyButton.qml + CameraButton.qml + images/camera_auto_mode.png + images/camera_camera_setting.png + images/camera_flash_auto.png + images/camera_flash_fill.png + images/camera_flash_off.png + images/camera_flash_redeye.png + images/camera_white_balance_cloudy.png + images/camera_white_balance_flourescent.png + images/camera_white_balance_incandescent.png + images/camera_white_balance_sunny.png + images/toolbutton.png + images/toolbutton.sci + + diff --git a/examples/multimediawidgets/declarative-camera/qmlcamera.cpp b/examples/multimediawidgets/declarative-camera/qmlcamera.cpp index 0d8dbc46..3da61565 100644 --- a/examples/multimediawidgets/declarative-camera/qmlcamera.cpp +++ b/examples/multimediawidgets/declarative-camera/qmlcamera.cpp @@ -50,8 +50,7 @@ int main(int argc, char* argv[]) // Qt.quit() called in embedded .qml by default only emits // quit() signal, so do this (optionally use Qt.exit()). QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit())); - view.setSource(QUrl::fromLocalFile(QCoreApplication::applicationDirPath() + - QLatin1String("/declarative-camera.qml"))); + view.setSource(QUrl("qrc:///declarative-camera.qml")); view.resize(800, 480); view.show(); return app.exec(); From 1e0b3d862500dbfdb4f9e4b0084cde99ef3a5a2b Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 20 Dec 2012 01:20:49 +0100 Subject: [PATCH 29/33] fix include statements Names are case sensitive when cross bulding for mingw on unix. Change-Id: I355b9388241c7c5fefb05b6f0c231efec4530c7e Reviewed-by: Michael Goddard Reviewed-by: Jonas Rabbe --- src/plugins/directshow/camera/dscameraservice.cpp | 2 +- src/plugins/directshow/camera/dsvideodevicecontrol.cpp | 2 +- src/plugins/directshow/camera/dsvideowidgetcontrol.cpp | 2 +- src/plugins/directshow/camera/dsvideowidgetcontrol.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/directshow/camera/dscameraservice.cpp b/src/plugins/directshow/camera/dscameraservice.cpp index 6d297416..fcbd1ef5 100644 --- a/src/plugins/directshow/camera/dscameraservice.cpp +++ b/src/plugins/directshow/camera/dscameraservice.cpp @@ -44,7 +44,7 @@ #if defined(HAVE_WIDGETS) #include -#include +#include #endif #include "dscameraservice.h" diff --git a/src/plugins/directshow/camera/dsvideodevicecontrol.cpp b/src/plugins/directshow/camera/dsvideodevicecontrol.cpp index 46865690..7c33d130 100644 --- a/src/plugins/directshow/camera/dsvideodevicecontrol.cpp +++ b/src/plugins/directshow/camera/dsvideodevicecontrol.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include extern const CLSID CLSID_VideoInputDeviceCategory; diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp b/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp index 843719b8..d7a913d7 100644 --- a/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp +++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp @@ -42,7 +42,7 @@ #include #include -#include "DSVideoWidgetControl.h" +#include "dsvideowidgetcontrol.h" #include "dscamerasession.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.h b/src/plugins/directshow/camera/dsvideowidgetcontrol.h index ac390c82..9249c317 100644 --- a/src/plugins/directshow/camera/dsvideowidgetcontrol.h +++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.h @@ -49,7 +49,7 @@ #include #include -#include "DsCameraControl.h" +#include "dscameracontrol.h" QT_BEGIN_HEADER From 47b0d553d99ba51c3ab942ee1eb7ba50c1387399 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sat, 22 Dec 2012 00:43:52 +0100 Subject: [PATCH 30/33] Bump Qt version to 5.0.1 Change-Id: Ic45b749ceea86263281b5c23509bf301fa334e5f Reviewed-by: Jonas Rabbe --- src/multimedia/doc/qtmultimedia.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf index 08a62890..3873bd25 100644 --- a/src/multimedia/doc/qtmultimedia.qdocconf +++ b/src/multimedia/doc/qtmultimedia.qdocconf @@ -3,7 +3,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = qtmultimedia description = Qt Multimedia Documentation url = http://qt-project.org/doc/qtmultimedia -version = 5.0.0 +version = 5.0.1 # The following parameters are for creating a qhp file, the qhelpgenerator # program can convert the qhp file into a qch file which can be opened in From 3df5999a07cfa8e23734cb939373cd4fe46fac74 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 22 Dec 2012 14:07:36 -0800 Subject: [PATCH 31/33] Remove comma at the end of the enum Required for public header cleanliness Change-Id: I2641fd085071b2a69806e8622c7c35be74f744b1 Reviewed-by: Jonas Rabbe --- src/multimedia/audio/qsound.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/multimedia/audio/qsound.h b/src/multimedia/audio/qsound.h index cf799e5d..a4d5327e 100644 --- a/src/multimedia/audio/qsound.h +++ b/src/multimedia/audio/qsound.h @@ -57,7 +57,7 @@ class Q_MULTIMEDIA_EXPORT QSound : public QObject public: enum Loop { - Infinite = -1, + Infinite = -1 }; static void play(const QString& filename); From 85faa55780a1057b4d1929a07c253847bfdc93fd Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Wed, 19 Dec 2012 14:36:55 +0100 Subject: [PATCH 32/33] Doc: Moved the qdocinc and image to the sourcedirs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QDoc parses the \input command relative to the sourcedirs and not exampledirs. So I had to move the qdocinc file and the corresponding image to the sourcedirs. Task-number: QTBUG-28727 Change-Id: Ie064f0b79ab8ffcb0587b43ff4508f5865a321a9 Reviewed-by: Martin Smith Reviewed-by: Topi Reiniö Reviewed-by: Sergio Ahumada --- examples/multimedia/video/doc/src/qmlvideo.qdoc | 4 ++-- examples/multimedia/video/doc/src/qmlvideofx.qdoc | 4 ++-- .../doc/src/examples}/video-qml-paint-rate.qdocinc | 6 +++--- .../doc/src}/images/video-qml-paint-rate.png | Bin 4 files changed, 7 insertions(+), 7 deletions(-) rename {examples/multimedia/video/doc/src => src/multimedia/doc/src/examples}/video-qml-paint-rate.qdocinc (78%) rename {examples/multimedia/video/doc => src/multimedia/doc/src}/images/video-qml-paint-rate.png (100%) diff --git a/examples/multimedia/video/doc/src/qmlvideo.qdoc b/examples/multimedia/video/doc/src/qmlvideo.qdoc index 359d0715..0f4de6ce 100644 --- a/examples/multimedia/video/doc/src/qmlvideo.qdoc +++ b/examples/multimedia/video/doc/src/qmlvideo.qdoc @@ -129,13 +129,13 @@ instance, the embedded \section1 Calculating and displaying QML painting rate -\input video-qml-paint-rate.qdocinc +\input multimedia/doc/src/examples/video-qml-paint-rate.qdocinc All that remains is to connect the afterRendering() signal of the QQuickView object to a JavaScript function, which will eventually call frequencyItem.notify(): \quotefromfile multimedia/video/qmlvideo/main.cpp -\skipto QmlApplicationViewer +\skipto QGuiApplication \printuntil ; \dots \skipto QQuickItem diff --git a/examples/multimedia/video/doc/src/qmlvideofx.qdoc b/examples/multimedia/video/doc/src/qmlvideofx.qdoc index b6535a95..a3b7c01a 100644 --- a/examples/multimedia/video/doc/src/qmlvideofx.qdoc +++ b/examples/multimedia/video/doc/src/qmlvideofx.qdoc @@ -203,13 +203,13 @@ And here is the effect selection menu: \section1 Calculating and displaying QML painting rate -\input video-qml-paint-rate.qdocinc +\input multimedia/doc/src/examples/video-qml-paint-rate.qdocinc All that remains is to connect the afterRendering() signal of the QQuickView object to a JavaScript function, which will eventually call frequencyItem.notify(): \quotefromfile multimedia/video/qmlvideofx/main.cpp -\skipto QmlApplicationViewer +\skipto QGuiApplication \printuntil ; \dots \skipto QQuickItem diff --git a/examples/multimedia/video/doc/src/video-qml-paint-rate.qdocinc b/src/multimedia/doc/src/examples/video-qml-paint-rate.qdocinc similarity index 78% rename from examples/multimedia/video/doc/src/video-qml-paint-rate.qdocinc rename to src/multimedia/doc/src/examples/video-qml-paint-rate.qdocinc index 84098e24..860f1427 100644 --- a/examples/multimedia/video/doc/src/video-qml-paint-rate.qdocinc +++ b/src/multimedia/doc/src/examples/video-qml-paint-rate.qdocinc @@ -2,7 +2,7 @@ The QML painting rate is calculated by the FrequencyMonitor class, which turns a stream of events (received via the notify() slot), into an instantaneous and an averaged frequency: -\quotefromfile video/snippets/frequencymonitor/frequencymonitor.h +\quotefromfile multimedia/video/snippets/frequencymonitor/frequencymonitor.h \skipto class FrequencyMonitor : public QObject \printuntil Q_OBJECT \skipto Q_PROPERTY(qreal instantaneousFrequency @@ -19,13 +19,13 @@ instantaneous and an averaged frequency: The FrequencyMonitor class is exposed to QML like this -\quotefromfile video/snippets/frequencymonitor/frequencymonitordeclarative.cpp +\quotefromfile multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp \skipto FrequencyMonitor::qmlRegisterType \printuntil } and its data is displayed by defining a QML item called FrequencyItem, like this: -\quotefromfile video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml +\quotefromfile multimedia/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml \skipto import FrequencyMonitor \printuntil id: root \dots diff --git a/examples/multimedia/video/doc/images/video-qml-paint-rate.png b/src/multimedia/doc/src/images/video-qml-paint-rate.png similarity index 100% rename from examples/multimedia/video/doc/images/video-qml-paint-rate.png rename to src/multimedia/doc/src/images/video-qml-paint-rate.png From 6902c5d770bfa79522d4349215c0b582642c7594 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sat, 22 Dec 2012 17:58:23 +0100 Subject: [PATCH 33/33] Add changes-5.0.1 file Task-number: QTBUG-26065 Change-Id: If025c8cc5be1304b30e3cbc983d0a1de31224a1b Reviewed-by: Jonas Rabbe Reviewed-by: Lars Knoll --- dist/changes-5.0.1 | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 dist/changes-5.0.1 diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1 new file mode 100644 index 00000000..cc5a6704 --- /dev/null +++ b/dist/changes-5.0.1 @@ -0,0 +1,51 @@ +Qt 5.0.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.0.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://qt-project.org/doc/qt-5.0/ + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt-project.org/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + +**************************************************************************** +* General * +**************************************************************************** + +General Improvements +-------------------- + +Third party components +---------------------- + +**************************************************************************** +* Library * +**************************************************************************** + + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + + +**************************************************************************** +* Compiler Specific Changes * +**************************************************************************** + + +**************************************************************************** +* Tools * +**************************************************************************** + + +**************************************************************************** +* Plugins * +**************************************************************************** +