summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* QNX 7.0.0 audio management supportJames McDonnell2018-01-162-12/+41
| | | | | | | [ChangeLog][QNX] Added support for QNX 7.0.0 audio management. Change-Id: Ia9f1740577527126bf666627647084382e4d7ce9 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-0617-140/+156
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5acdc7e0bd3729b80522dfff0f388cf2507fb111
| * examples: use Qt5-style connects where possibleJochen Seemann2017-12-1916-140/+145
| | | | | | | | | | | | | | | | | | Additionally, remove obsolete CHECKED_CONNECT macro from the spectrum example. Change-Id: Id6fe01718679463c2b025d688c970583d64d60e9 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * winrt: Store output to cache locationMaurice Kalinowski2017-12-121-0/+11
| | | | | | | | | | | | | | | | | | By default sandboxing does not allow to store a file outside the package. Task-number: QTBUG-60904 Change-Id: I586616713315eadafd6bb24a8f8c12eb794557f6 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Port away from QRegion::rects()Marc Mutz2017-12-041-1/+1
| | | | | | | | | | | | | | Use begin()/end() instead. Change-Id: Ifa17458190186b987533bd705717ddaec5fc94d4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-201-2/+12
|\| | | | | | | Change-Id: Icaf645e271b21320c4cb6269178d9e722092a263
| * Fix outdated BSD license headerLiang Qi2017-11-161-2/+12
| | | | | | | | | | Change-Id: I5b952a41be87f250810419674f52486acad34e07 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Implement QCustomAudioRoleControl for QNXJames McDonnell2017-11-143-1/+14
| | | | | | | | | | Change-Id: I95202ffabbeae36dbb2f2fa43871e0bceed53cae Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-27118-354/+1394
|\| | | | | | | Change-Id: Ib509a8c90dd6c7229510a400612cc27a4957d015
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-27118-354/+1394
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/multimedia/declarative-radio/view.qml src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h Change-Id: I97b507878b6de04ec38ddd13530e58b8f72390e4
| | * Fix outdated BSD license headerKai Koehne2017-10-18104-313/+1353
| | | | | | | | | | | | | | | Change-Id: I386d30a54819bae016cb50cf5892a5ac380288f9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Fix outdated FDL license headerKai Koehne2017-10-1814-42/+42
| | | | | | | | | | | | | | | Change-Id: I9cd7043058352ba2aeded74f86d863fca29bd37d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-1931-1010/+842
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/qnx/mediaplayer/mmreventmediaplayercontrol.h Change-Id: Ic6e27742ef6d1af0532ad05902a1431ebd5f449d
| * | Modernize the Declarative Radio exampleVaL Doroshchuk2017-10-054-101/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added responsive UI. Added Button type. Task-number: QTBUG-60627 Change-Id: I69d10ad735706538b31c7bf1810e90d5a884a382 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | Modernize the Video Widget exampleVaL Doroshchuk2017-09-282-49/+42
| | | | | | | | | | | | | | | | | | | | | | | | Changed initialization style, 0 -> nullptr, made some cleanup. Task-number: QTBUG-60627 Change-Id: I3443b4ed4ea1d118aadb777df07921505dd29844 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | Modernize the Camera exampleVaL Doroshchuk2017-09-282-89/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changed style of members. Applied QScopedPointer. Task-number: QTBUG-60627 Change-Id: Id36f3f9d268956471c606293fb651d6aa9a4dec7 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | Modernize the Audio Recorder exampleVaL Doroshchuk2017-09-285-75/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Foreach to for. Changed initialization style. Renamed QAudioLevel -> AudiLevel. Changed connection signal/slot style. Task-number: QTBUG-60627 Change-Id: I3538433680086a2c4ee52ee22a5180c6d824b897 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | Modernize the Audio Output exampleVaL Doroshchuk2017-09-282-165/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed initialization style. Recoded toggleMode. Removed unneeded defines, function members. Changed signal/slot connection style. Changed foreach to c++11 style. Fixed bug with wrong duration seconds. Task-number: QTBUG-60627 Change-Id: Ib62f7979f2a32d629482026e0d954612b2665d66 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | Modernize the Audio Input exampleVaL Doroshchuk2017-09-282-133/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unneeded defines. Removed unneeded members. Removed using QScopedPointer where is not needed. Changed some member functions to lambdas in signal/slot. Changed initialization style. Recoded toggleMode. Task-number: QTBUG-60627 Change-Id: Iaf6bb297bc0b87509fcda956bfd082e80a3226c4 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | Modernize the Audio Devices exampleVaL Doroshchuk2017-09-282-61/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the style of member initialization. Provided small cleanup. Changed 0 to nullptr. Changed to new signal/slot style if possible. Task-number: QTBUG-60627 Change-Id: I995d62b8d3741c719565f5b203b1046e8701d238 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | Modernize the Player exampleVaL Doroshchuk2017-09-2810-294/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed memory leak. Renamed members, avoided passing args by copy. Changed the style of member initialization. Changed 0 to nullptr. Changed to new signal/slot style if possible. Removed Q_WS_SIMULATOR ifdef. Changed signal/slot connection style. Task-number: QTBUG-60627 Change-Id: I85bd6e56fe87f4e17f3c9964d6d1fdcb8202c519 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | Modernize the Video Graphics Item exampleVaL Doroshchuk2017-09-282-43/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changed initialization style, nullptr Cleanup. Task-number: QTBUG-60627 Change-Id: Ic6048274394fca4b0f595e96ace23bdd5096ddda Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-221-4/+4
|/ / | | | | | | | | Change-Id: I17b3650a3df5688274151c1f2c4629e4a5062028 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-07-0612-55/+91
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5f9bed6cb611471db61b9c69004f16786822625d
| * Camera example: Brush up to C++11Friedemann Kleint2017-06-268-53/+55
| | | | | | | | | | | | | | | | | | Use Qt 5 signal/slot syntax, range based for, member initialization. Add message for captured images and fix some minor issues. Task-number: QTBUG-60627 Change-Id: I1011fc95d928a9d2edaad16120acb0dc41f987d9 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * Add shutter icon to camera exampleFriedemann Kleint2017-06-264-2/+36
| | | | | | | | | | | | Task-number: QTBUG-60627 Change-Id: Ib7268d2b939614e713ea6ac209f1c162002d6142 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-077-3/+54
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I20470ed193e818eefedd975d89f755fb9d673241
| * iOS: Add Info.plist files to indicate camera and microphone usageAndy Shaw2017-04-287-3/+54
| | | | | | | | | | | | | | | | | | | | Since iOS 10 the Info.plist file needs to indicate that it requires the usage of the camera and microphone in any application that requests them. So this adds Info.plist files to be used by the examples in that capacity. Change-Id: I16c6607366f57f4e950e53e1de1fbc0ac224df10 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Implement QAudioRoleControl for QNXJames McDonnell2017-03-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The system must provide a JSON file that maps Qt audio roles to the system's audio types. This is necessary because QNX doesn't dictate the audio types that a system must use. Anyone creating a QNX system is free to define whatever audio types they deem to be appropriate for that system. Set the audio role for the Qt player example to VideoRole and added code to dump the supported audio roles. Change-Id: I34d2c5da0033f69b9dd476a0eadccf3d87d07bfd Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | io-audio based audio management for QNX 7.0.0James McDonnell2017-03-271-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add code to setup and handle io-audio based audio management notifications. Add InterruptedState to QAudio::State. Indicates that this stream is in a suspended state because another higher priority stream currently has control of the audio device. Playback cannot resume until the higher priority stream relinquishes control of the audio device. Adjust the documentation for QAudio::State SuspendedState to reflect the fact that audio management events can also put the stream into this state. Add InterruptedState handling to the spectrum example. Change-Id: Ie8616af03ae4c503de1d0571a222e5853035cc0e Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Propagate audio category into the QNX audio output objectJames McDonnell2017-03-272-0/+20
|/ | | | | | | | | | | For QNX 7.0.0, set the QNX stream type to the audio category. 6.6.0 doesn't support stream types. Add a -category command line argument to the spectrum example so that the audio category can be specified. Change-Id: I6a81210ce07dc4bd2f6cf81983c2f3e4c480ef0d Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Add audio probe handling in the player exampleChristian Strømme2017-01-274-8/+219
| | | | | | | | Adds histogram widgets to visualize the data received from the audio probes, similar to what's done for the video probe already. Change-Id: Ie49a7766dc7ddcab1d9ccaf31372fb23f9ff5b68 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devYoann Lopes2017-01-2619-46/+46
|\ | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/multimediawidgets/videographicsitem/videoplayer.h src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp Change-Id: Id5ce05ffe2cd25657232157b162680b2e24a35ba
| * Examples: Add missing overrideAlexander Volkov2016-12-1219-46/+46
| | | | | | | | | | | | Change-Id: I54529fdc8013497edb98ee97863fe4a141bdbf1c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-127-21/+47
|\| | | | | | | | | | | | | Conflicts: src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp Change-Id: I7c30c2d13fdd07ee07e4449d5d3e256e988d3793
| * Cleanup all maemo/meego specific codeLars Knoll2016-11-143-20/+0
| | | | | | | | | | Change-Id: I6c6f28084c6b030928eebc53c5d0009b168ede6a Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * Move qtmultimedia over to the new config systemLars Knoll2016-11-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Use the new configuration system to define external libraries, configure tests and features. Don't use pkg-config outside of the configuration step. And move all command line options over from qtbase, so that we can remove them from there in a second step. Change-Id: I1aa4b557a6aee17eeceb00602005a2d28b426a26 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-113-0/+45
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtmultimedia.pro src/multimedia/playback/qmediaplayer.cpp src/plugins/directshow/directshow.pro tests/auto/integration/qmediaplayerbackend/BLACKLIST Change-Id: I6dacdcbb223c1d12dd72eb308a67170983c709b3
| | * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-043-0/+45
| | |\ | | | | | | | | | | | | Change-Id: Ib038c5e3ebb48c0e46569a35d530fa5ceaf06a32
| | | * iOS: add Info.plist to declarative-camera exampleRichard Moe Gustavsen2016-11-022-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It contains 'NSCameraUsageDescription', which is needed for the app to have access to the camera. Change-Id: I9843524f8eff84450156dfa7a9d6000c19c8ff8d Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | | * iOS: add NSCameraUsageDescription to Info.plist for qmlvideofxRichard Moe Gustavsen2016-11-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'NSCameraUsageDescription' key is needed for the app to have access to the camera. Change-Id: I8b98247993edd450772e5393551e4acb07dcf0a0 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | | Polish the QtWidgets/videographicsitem exampleFriedemann Kleint2016-11-293-22/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to 787211c1d2082874ea07be4c5987032221ee48fe: - Point the file dialog to the Movies folder. - Port to Qt 5 connection syntax. - Add command line handling. - Determine size according to screen size. Change-Id: I21b195a9241dbac332ce74168bd43f1d8c273091 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | | Fix binding loop for declarative-cameraJochen Seemann2016-08-241-2/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | qrc:///VideoCaptureControls.qml:112: Error: Cannot assign [undefined] to QString qrc:///CameraListButton.qml:65:5: QML CameraListPopup: Binding loop detected for property "currentValue" Change-Id: I93105fb33f65654492faaefc0d9109851e353e59 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | Use logarithmic volume scale in examples.Yoann Lopes2016-06-143-9/+9
| | | | | | | | | | | | | | | | | | | | | Sounds much better than a cubic scale. Change-Id: I4daaa333a5e1f24b93443d624b024a1263979538 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | Use new volume conversion API in examples.Yoann Lopes2016-06-034-10/+41
|/ / | | | | | | | | | | | | | | Volumes sliders are now scaled cubically so that loudness changes are perceived linearly. Change-Id: Ibf00d6a97d872063d92457493417be5eb42f79ac Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-1010-22/+78
|\| | | | | | | | | | | | | Conflicts: src/plugins/winrt/qwinrtcameracontrol.cpp Change-Id: I45d3042adf19577a72794610fa1c310cb22e26c4
| * Polish the videowidget example.Friedemann Kleint2016-05-043-19/+62
| | | | | | | | | | | | | | | | | | | | - Add command line parsing and file argument. - Port to Qt 5 connection syntax. - Adapt size to available geometry (for High DPI). Task-number: QTBUG-53114 Change-Id: I1c1c547ddb14210ef5900f99f4870d6d91b67088 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * fix example installsOswald Buddenhagen2016-04-286-0/+16
| | | | | | | | | | Change-Id: I9daec1e1ec1bc163d451ac03685ef6caba7dbde7 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * winrt: Remove capability specificationMaurice Kalinowski2016-04-211-3/+0
| | | | | | | | | | | | | | This is handled with 34e0e908c896126138a95abdeba7456499d0fb68 in qtbase. Change-Id: I41cf27690189aefb3000de90df4a518d8dd449f0 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-085-0/+0
|\| | | | | | | Change-Id: I7de78c63b5f81620474c69e5c651202c553a70d7