summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Moved declarative-camera example in the right directory.Yoann Lopes2013-07-2430-6/+2
| | | | | | | | | This example was in the multimediawidgets directory but doesn't depend on or use the QtMultimediaWidgets module. Moved to 'examples/multimedia' instead. Change-Id: Ic2fcc6576e95664e0002531ee378a4366daa56c1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-206-9/+9
|\ | | | | | | Change-Id: I0361cbb4f5398bb13e675c3de04519c414daea43
| * Fix for url bug in the qmlvideo examples.Christian Strømme2013-06-136-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | In the FileBrowser paths where being prepended with file:///, since all the paths already starts with a forward slash, navigating away from the initial directory was therefore not possible. To make the examples work on Android, QT += multimedia was added. Change-Id: Iff96729d476c4292999b022bdd6d5770b6b011e7 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | Doc: Fix some broken links and quote pathsSze Howe Koh2013-06-132-32/+32
|/ | | | | | | | | | | | | The correct paths are relative to: - <reporoot>/examples/<module>, or - <reporoot>/src/<module> Removing the module specifier fixes these links/quotes. Change-Id: I6be4f28c44bd26361b60a394158b0e6cc46b1ec0 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Decouple qmediametadata.h from qmultimedia.hSze Howe Koh2013-05-142-1/+2
| | | | | | | | qmultimedia.h is included in more places, but qmediametadata.h is larger. This patch should reduce unnecessary #include-ing. Change-Id: I4a3d174bafc555d794bb75087c1f6b79745ae903 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* qmlvideo example, add missing #ifdef PERFORMANCEMONITOR_SUPPORTv5.1.0-beta1David Fries2013-05-081-0/+2
| | | | | | | | This usage of PerformanceMonitor needs to be protected by the same preprocessor check as the header include that makes it available. Change-Id: Ie8a1b6e99a61c333ceedcf2e9751235fc2efb415 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Fix example paths referred in documentationTopi Reinio2013-04-3014-14/+14
| | | | | | | | | | | qdocconf files for both Qt Multimedia and Qt Multimedia Widgets already define the correct example path. This change fixes also the example documentation to use the correct path, as well as the link to examples in Multimedia Overview. Change-Id: I72d75027ee18f6398eb76dc40bcc3d122541b1c9 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix file path bug in audiorecorder exampleAndy Nichols2013-04-162-22/+0
| | | | | | | | | | | | | Default path and name of the output wave audio files were wrong. This means the files did not have the right name to be opened on Windows, and did not have the right path because they were being saved to the root folder. (C:/ on windows, and / on OSX). Now we fall back to the default filepath and name when we try to record without giving a path and filename. Task-number: QTBUG-28663 Change-Id: I8c782a31710cac65cd3c1ecd44de10b41c46e93d Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-0/+2
|\ | | | | | | Change-Id: I905886417147ceb529ded43896939f65e66d7424
| * Disable FFT when building in static modeDavid Faure2013-03-251-0/+2
| | | | | | | | | | | | | | | | | | | | This is because fftreal's pro file says: static: error(This library cannot be built for static linkage) Found due to a CI failure on win32-msvc2010_static_Windows_7. Change-Id: I2a4630410fa7a1bb4e6ab158a4f7ae76d5cacd8a Reviewed-by: Holger Ihrig <holger.ihrig@gmail.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | add error handling in image capturing in cameraJing Bai2013-02-193-1/+15
|/ | | | | | Task-number: QTBUG-28589 Change-Id: Ib3a04038c16beba66f8b8cff85b310dad9a4460a Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Loop video infinetely on qmlvideofx.sanevala2013-02-191-0/+1
| | | | | Change-Id: I40e444e75f0fd08860920b78b5b5ff190bce9ae9 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* User cannot press cancel after folder up.sanevala2013-02-191-24/+25
| | | | | | | | Moved cancel button on top of folder list views. Selected file is not anymore emitted on cancel. Change-Id: Ia7b666b4519fe03ca36c41d1694d2ad3ff4ace51 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* User is not able to select file from FileBrowser and play it.sanevala2013-02-192-8/+14
| | | | | | | | When string is converted to Url qrc:// scheme is used. Fix Filebrowser to use file:// scheme instead. Change-Id: I713e704eb52d27d046ace1ff7d65feb98635461d Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Video has ended UI say tap to stop.sanevala2013-02-191-0/+1
| | | | | | | Loop video infinetely so tap to stop & start state is correct. Change-Id: I56af6eb00fcc7811cc25099df3c7fa47f429a3e6 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* User cannot press cancel after folder up.sanevala2013-02-191-24/+25
| | | | | | | | Moved cancel button on top of folder list views. Selected file is not anymore emitted on cancel. Change-Id: I37884e142e774fb03d1a39e4b30e71a4e9f1001f Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Fix qrc references on qmlvideo example.sanevala2013-02-191-3/+3
| | | | | Change-Id: I0722e720dbc017186cefd0e45dd5a11023906b56 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* User is not able to select file from FileBrowser and play it.sanevala2013-02-192-5/+9
| | | | | | | | When string is converted to Url qrc:// scheme is used. Fix Filebrowser to use file:// scheme instead. Change-Id: I9617d9503ed403de7d017b8586ae37b05dc096cb Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Doc: Fix module name formatSze Howe Koh2013-01-299-12/+12
| | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtMultimedia -> Qt Multimedia (Also, QtMultimediaKit has been merged into Qt Multimedia in Qt 5) Change-Id: I3c23435d5eceb946ea320756b835da937726db24 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* QAudioInput/Output documentation: Fix slot naming in snippetsTopi Reinio2013-01-254-6/+6
| | | | | | | | | | | | | | | Having a code snippet use a slot (stateChanged) with a name identical to a signal in QAudioInput / QAudioOutput classes causes problems (incorrect links) in class documentation that refer to the snippet code. This change renames the slots according to standard Qt convention. Same change is applied to example applications as well. Task-number: QTBUG-26688 Change-Id: I0c6181240237d0c642b73fe18f3ddb5137b7f207 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Fixed random QDoc warningsVenugopal Shivashankar2013-01-151-1/+1
| | | | | | | | | | | | | - Fixed \snippet paths - Minor language edits - Removed unnecessary multiple page commands in a single comment block. For example, \fn and \qmlsignal in a single comment block is not allowed. Such instances must be documented in separate comment blocks. Change-Id: I65f4518499e2600c4e1807356d4116c575e48c19 Reviewed-by: Andy Nichols <andy.nichols@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-113-5/+5
| | | | | | | Change-Id: I14da5455b7dd4681254e1652395df5f5c65746bd Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-10240-240/+240
| | | | | | Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Doc: Moved the qdocinc and image to the sourcedirsVenugopal Shivashankar2013-01-024-47/+4
| | | | | | | | | | | | 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 <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Use qrc to deploy qml files in declarative-camera examplesKai Koehne2012-12-213-2/+28
| | | | | | | | 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 <oswald.buddenhagen@digia.com>
* Polish and fix qmlvideofx examplehjk2012-12-2033-123/+122
| | | | | Change-Id: I30f6d7d2af784ba018a659a16aceb4876a4b1be6 Reviewed-by: hjk <qthjk@ovi.com>
* Example: Notify user of errorsSze Howe Koh2012-12-192-1/+17
| | | | | | | | Before, the widget simply failed silently, which gave the impression that the widget is broken. Change-Id: I8ab7ed0e0a62f9643791b6f4732f7f3b2cd7521a Reviewed-by: Martin Smith <martin.smith@digia.com>
* Examples: Remove qmlapplicationviewer template.v5.0.0Kai Koehne2012-12-1713-224/+118
| | | | | | | | | Fix shadow-builds for qmlviewer examples by using qrc files instead. Task-number: QTBUG-28614 Change-Id: Iec993f95166ffd09e8edff552ceca5bc4112d293 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* remove QT+=widgets from SUBDIRS projectsOswald Buddenhagen2012-12-163-5/+0
| | | | | | | it makes no sense whatsoever Change-Id: I114799dbe35ac31f6d90642ba8c5dbe3fc075604 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-161-2/+0
| | | | | | | | 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 <joerg.bornemann@digia.com>
* Doc: Updated the \example and \snippet pathsv5.0.0-rc2Venugopal Shivashankar2012-12-1214-72/+67
| | | | | | | | | | 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 <jerome.pasion@digia.com>
* Get rid of useless requestOrientation() calls in the examples.Samuel Rødal2012-12-062-2/+0
| | | | | | | | 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ø <tor.arne.vestbo@digia.com>
* centralize and fixup example sources install targetsJoerg Bornemann2012-12-05406-271/+215
| | | | | | | | This follows suit with aeb036e in qtbase. Change-Id: Ie8580d0a1f38ab9858b0e44c9f99bdc552a1752a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Doc: Added missing images and made some language editsVenugopal Shivashankar2012-11-3010-7/+53
| | | | | Change-Id: I9544121601c2c4099927e0e23550c3ab32bbfda9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Update links from labs.qt.nokia.com to blog.qt.digia.comSergio Ahumada2012-11-272-2/+2
| | | | | Change-Id: I003c9a5061efe586ecdadde58827ef4887b49b5f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix building of examples.Friedemann Kleint2012-11-2214-321/+54
| | | | | | | | | | | | | | - Correct install paths - Add missing resources - Add declarative-radio - Remove deploy/install logic from qmlapplicationviewer.pri and snippet .pro-files of the video examples and add normal install rules. Task-number: QTBUG-27977 Change-Id: Iadecb14d9330c752f6fb739918da743a854ba236 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix building of installed player example.Friedemann Kleint2012-11-211-1/+1
| | | | | | Task-number: QTBUG-27977 Change-Id: I383cd971a54d40008f9a5899f043abb9961c489a Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Multimedia: examples coding style unificationhjk2012-11-2169-459/+387
| | | | | Change-Id: Iffae3a276bb2b01f871aee76dc069ce006d69fce Reviewed-by: David Schulz <david.schulz@digia.com>
* QtMultimedia: examples/camera coding stylehjk2012-11-216-72/+57
| | | | | | | Also unconditionally include code for Qt >= 4.7 Change-Id: Ic8b9d009a54f9e0fe7e9477c75c125ad09a485ee Reviewed-by: David Schulz <david.schulz@digia.com>
* simplified exampleMaurice Kalinowski2012-11-202-10/+0
| | | | | | | | | - do not use any opengl additions inside this simple example - also fixes problems in relation to mixing angle with GLWidgets Task-number: QTBUG-27963 Change-Id: I69a966b886cd8b3e88d6f3be48463eee59baa58a Reviewed-by: hjk <qthjk@ovi.com>
* Adding 3rdparty library libfftreal to install stepHolger Ihrig2012-11-081-1/+2
| | | | | | | | | | Adding libfftreal to install step in this directory, otherwise it will not be deployed for the installers Task-Number: QTBUG-27876 Change-Id: I090b61def94eee9c63d732067036b3ca5398cc52 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* All QWindow properties that have "window" in them have been renamed.Shawn Rutledge2012-11-082-4/+4
| | | | | | | Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I2903a7404a738ae651ba07d4bdc003520473bd80 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Rename namespace QtMultimedia -> QMultimediaSze Howe Koh2012-11-064-16/+16
| | | | | | | | | | | | | | | | Main code, examples, tests and docs updated. Method: 1. Mass find+replace "QtMultimedia::" -> "QMultimedia::" 2. Hand-modified declaration in qtmedianamespace.h/cpp For consistency (with minimal disruption), namespaces with a "Qt" prefix will be renamed. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Rename namespace QtMultimedia::MetaData -> QMediaMetaDataSze Howe Koh2012-11-062-4/+4
| | | | | | | | | | | | | | | | | | Main code, examples, tests and docs updated. Method: 1. Remove unused forward-declarations, "class QMediaMetaData" 2. Mass find+replace "QtMultimedia::MetaData" -> "QMediaMetaData" 3. Un-nest from the QtMultimedia namespace in qtmedianamespace.h For consistency (with minimal disruption), namespaces with a "Qt" prefix will be renamed. Also, Qt guidelines don't include nested namespaces (http://lists.qt-project.org/pipermail/development/2012-October/006756.html) Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I40e59c1cf58c1792725e735e9285c51bc5f226b1 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Use QVideoGraphicsItem in the videographicsitem example.Yoann Lopes2012-10-0218-32/+366
| | | | | | | | | | The videographicsitem example now uses QVideoGraphicsItem instead of a custom QAbstractVideoSurface. The old code has been moved to a new example: "customvideosurface/customvideoitem". Change-Id: I83212f36168ef94d670b447eb1a742a39753939d Reviewed-by: Jason Barron <jason.barron@digia.com>
* QVideoWidget: fixed setFullScreen(false) on the Xcb platform.Yoann Lopes2012-10-011-1/+1
| | | | | | | | | | Fixed exiting fullscreen when a QVideoWidget is embedded in another QWidget. Requires change I3616dc0f in qtbase to work. Because of a bug in some X window managers, the order in which setWindowFlags() and showNormal() are called has been changed. Change-Id: I335d47a3a1d9ce517978cad35597d72312150db1 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Doc: Moved example documentation and imagesVenugopal Shivashankar2012-09-2629-0/+1062
| | | | | | | | | Changed to adhere to the new documentation structure outlined here: http://qt-project.org/wiki/Qt_Documentation_Structure Change-Id: I634e086c7d55abfac3680144cbbe97059fcbea4f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Use QVideoWidget in the videowidget example.Yoann Lopes2012-09-2612-11/+304
| | | | | | | | | | | | The videowidget example now uses QVideoWidget instead of a custom QAbstractVideoSurface, the former being the most straightforward and fastest way of showing a video in a QWidget. The old code has been moved to a new example: "customvideosurface". Change-Id: I15fb4482d0e77bafd24d4cb03316fc8f4ef13c35 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Jason Barron <jason.barron@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-24222-3623/+3623
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Id77334cfb15de096941c88e32d04ca07b4eb4709 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Make compile with -no-widgetsTasuku Suzuki2012-09-041-8/+10
| | | | | Change-Id: I6a057950315a1e2084fd6fc130007f865d096f12 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 05:45:43 +0000