summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-223-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I2ac34243ebe39c93860c5ac595c2f1eca4322eb8 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-222-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Change-Id: Iff326d7e63d6e0106204beb1f42700032cb6b79a Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Remove AndroidManifest.xml from qmlvideofx example.Christian Strømme2016-04-052-53/+0
| | | | | | | | | | | | | | | | | | | | | | | | The manifest in qmlvideofx example is useless, and with the strict requirement of API level 16 or higher (585287d0@qttools), it means it's not working out of the box anymore. To avoid similar issues in the future, this change just removes the manifest (instead of bumping the min. version). Task-number: QTBUG-52374 Change-Id: I6c672bdbe23935852c87c93e425003b7b6827771 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-212-9/+10
|\| | | | | | | Change-Id: Ieb1a3081907093e31e8c8b7f95993bb3b2173672
| * Reinitialize audio when changing device in examplesMaurice Kalinowski2016-03-112-9/+10
| | | | | | | | | | | | | | | | | | Different devices might have different audio formats supported. Always relying on the format of the default device can cause the audio endpoint to not start/initialize. Change-Id: I4d05949fd023f2cc7eb1f75db3577242e0e66680 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-073-23/+55
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/avfoundation/mediaplayer/mediaplayer.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro Change-Id: I5742596230dc510ba2a09eba624429bb67179194
| * Polish the QtWidgets/Player example.Friedemann Kleint2016-03-013-23/+55
| | | | | | | | | | | | | | | | | | Point the file dialog to the Movies folder. Add command proper command line handling. Change the logic to use QUrl everywhere. Change-Id: I1e54e600187153f52a55e3a381a24e4f2eeda3ab Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-19122-2072/+4146
|/ | | | | | | | | | | From Qt 5.7 -> examples are lisenced under BSD license, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new BSD header instead of LGPL21 one (in those files which will be under BSD) Change-Id: I5b1b87239b21e4b57ca6c8648d69ba090d75c8a8 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* winrt: add capabilities to launch app out of the boxMaurice Kalinowski2016-01-131-0/+3
| | | | | Change-Id: I1cb8a589ee61f1dbc53bfd70eb25e7d2000af13e Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* Doc: Fix documentation warningsTopi Reinio2016-01-0814-45/+45
| | | | | | | | | | - Fix incorrect paths passed to \example command - Fix resulting linking issues - Fix examplesinstallpath in .qdocconf - Remove unnecessary group definition Change-Id: I72a437ac6d297f3c63d4f29a0e3110971d1e330f Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Fix for disallowed property bindings in qml effect filesPaolo Angelelli2015-11-0612-17/+106
| | | | | | | | | | | | According to the documentation of ListModel.get, "The returned object is not guaranteed to remain valid. It should not be used in property bindings." So the property bindings have been removed, and a js function has been introduced to update the properties upon list change. Task-number: QTBUG-49221 Change-Id: Idaed746ca237198b52a3aff0234076331e1512c1 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Purge spurious execute permissions.Edward Welbourne2015-09-291-0/+0
| | | | | | | | Source code and graphics are not for running. Change-Id: I3b015b3cefd70329036c044f1b6c478d50453054 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Doc: Use the screenshot in the Declarative Radio example documentationTopi Reinio2015-05-192-1/+3
| | | | | | | | Also, crop the screenshot image to not show any window decoration, and fix the example \brief. Change-Id: I86310bdc5a4f124180eac1a1d27064286ba34f59 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Update license header in qmlvideofx example.Yoann Lopes2015-05-051-7/+7
| | | | | Change-Id: Icb525176a8f00cc1a7414e68a7452452d1ef3da0 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Yoann Lopes2015-05-052-0/+44
|\ | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/plugins/avfoundation/camera/avfcamerasession.h src/plugins/avfoundation/camera/avfcamerasession.mm Change-Id: Ib2e25d907a7069591920d2f69e007f314cc0fd85
| * Restore ContentCamera.qmlChristian Strømme2015-04-162-0/+44
| | | | | | | | | | | | | | | | | | | | The file was removed in 5c3a5cf8106e1b873924b296c792448c33ee4df1 but left the description, documentation and parts of the functionality unchanged. This change adds the camera functionality back into the example. Change-Id: I3bfdd95f8322796d446c571a4e074ce98e5443dd Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-04-155-29/+16
|\| | | | | | | | | | | | | | | Conflicts: src/multimedia/playback/playlistfileparser.cpp src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp Change-Id: I52950def2b8283ae15797d05d4ead6a1256eba19
| * Fix audioengine example.Yoann Lopes2015-04-075-29/+16
| | | | | | | | | | | | | | | | | | | | | | | | - Add missing audio files - Fix 'Unable to assign double to QVector3D' warning - Don't show decimal part of the volume Task-number: QTBUG-41841 Task-number: QTBUG-44304 Change-Id: Ie24284242bbac0d10bd85841932c506d7634a514 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * Replace blog.qt.digia.com with blog.qt.ioSergio Ahumada2015-02-062-2/+2
| | | | | | | | | | | | Change-Id: I2c0a3ba90c3343b362cd756584979f1b08405d34 Reviewed-by: Tero Kojo <tero.kojo@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Made audio output example easier to understand. No real code changesd3fault2015-04-102-8/+10
| | | | | | | | | | | | | | | | | | | | Maybe it's just me, but every time I try to read the "toggleMode" method in the audio output example, I get confused on whether I'm switching to/ from push/pull mode, and even what pushing and pulling entails. The name of the push timer also seemed backwards (which added to the confusion). Change-Id: I5ff7d18f72490c22b91a948ad7513b402a01c5e4 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Fix debug stream operators.Friedemann Kleint2015-04-072-4/+6
| | | | | | | | | | | | | | | | | | | | - Use QDebugStateSaver to restore space setting in stream operators instead of returning dbg.space() which breaks formatting on streams that already have nospace() set. - Fix some single character string constants, streamline code. Change-Id: I18ae7324b172ea801aa9b5fe56ddf6fe527fdde9 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | Fix QNX 6.6 build by using qSqrt() and qLn()Sergio Martins2015-03-281-2/+2
| | | | | | | | | | | | | | | | spectrumanalyser.cpp: In member function 'void SpectrumAnalyserThread::calculateSpectrum(const QByteArray&, int, int)': spectrumanalyser.cpp:138:59: error: 'sqrt' was not declared in this scope Change-Id: Ib43c693d73d2342059092094cfc3f48a0f73b4bc Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | Improvide device selection in the video filter exampleLaszlo Agocs2015-03-163-25/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The non-OS X path also uses clGetGLContextInfoKHR when available, instead of just blindly taking the first GPU device for the platform. This way we get the correct OpenCL device in case the application is using an OpenGL context on the same vendor's second GPU. On Windows desktop OpenGL is now correctly forced and therefore there is no need to waste time on runtime checks for ANGLE later on. Remove the hard-coded custom pathes from the .pro file. Also fixes error reporting on the OS X specific path. Change-Id: I8d6ab867510d113d5135b61e66822381e81c995a Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>