summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes-5.0.1 fileSergio Ahumada2013-01-031-0/+51
| | | | | | | Task-number: QTBUG-26065 Change-Id: If025c8cc5be1304b30e3cbc983d0a1de31224a1b Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Moved the qdocinc and image to the sourcedirsVenugopal Shivashankar2013-01-024-7/+7
| | | | | | | | | | | | 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>
* Remove comma at the end of the enumThiago Macieira2012-12-281-1/+1
| | | | | | | Required for public header cleanliness Change-Id: I2641fd085071b2a69806e8622c7c35be74f744b1 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Bump Qt version to 5.0.1Sergio Ahumada2012-12-251-1/+1
| | | | | Change-Id: Ic45b749ceea86263281b5c23509bf301fa334e5f Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* fix include statementsMark Brand2012-12-244-4/+4
| | | | | | | | Names are case sensitive when cross bulding for mingw on unix. Change-Id: I355b9388241c7c5fefb05b6f0c231efec4530c7e Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.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>
* WMF: Fixed incorrect QMediaPlayer volume reporting.Yoann Lopes2012-12-211-5/+6
| | | | | | Task-number: QTBUG-26621 Change-Id: Id70a68ad61fd7d68f4ee277f33a54bd9c00c05d0 Reviewed-by: Jason Barron <jason@cutehacks.com>
* Polish and fix qmlvideofx examplehjk2012-12-2033-123/+122
| | | | | Change-Id: I30f6d7d2af784ba018a659a16aceb4876a4b1be6 Reviewed-by: hjk <qthjk@ovi.com>
* Add qmake generated files to .gitignore.Miikka Heikkinen2012-12-201-0/+3
| | | | | | | | Add source files generated by qmake for automatic static plugin imports to .gitignore. Change-Id: I38977c5d410e1dc9f424de39c88a9fcd281d1e69 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.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 obsolete DEPENDPATH assignmentsOswald Buddenhagen2012-12-163-3/+0
| | | | | | | | qmake now add CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: Iffd78b4c7cf8d048a822b75c481ac380b3d8d0f4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-1646-48/+1
| | | | | | | | 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: Fixed broken links to the Multimedia examplesVenugopal Shivashankar2012-12-141-12/+15
| | | | | | | | | | | - 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 <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Updated the \example and \snippet pathsv5.0.0-rc2Venugopal Shivashankar2012-12-1236-117/+133
| | | | | | | | | | 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>
* test: Mark tst_QPainterVideoSurface as insignificant on WindowsSergio Ahumada2012-12-111-0/+2
| | | | | | Task-number: QTBUG-28542 Change-Id: Ib879ffd31e534cc9cde4c4893af6f2a7799529cd Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* test: Mark tst_QDeclarativeVideoOutputWindow as insignificant on WindowsSergio Ahumada2012-12-111-0/+2
| | | | | | Task-number: QTBUG-28541 Change-Id: I5d59a1daf5494aca28a573e312bbf1bf8e7d95e2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* WMF: Fixed crash when cancelling media loading.Yoann Lopes2012-12-111-0/+4
| | | | | | | | 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 <andy.nichols@digia.com>
* WMF: Improved error reporting.Yoann Lopes2012-12-111-27/+35
| | | | | | | | | | | 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 <andy.nichols@digia.com>
* Add PLUGIN_CLASS_NAME to qtmultimedia pluginsMiikka Heikkinen2012-12-1018-0/+18
| | | | | | | | Needed for automating static plugin loading. Task-number: QTBUG-28131 Change-Id: Ia392b112fc46dedd34c9ffdbd6e874dbbfeaef83 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: Replace outdated macroChristian Stenger2012-12-071-1/+1
| | | | | Change-Id: I9bc0f8a077e60ede0ac1b6852b66d33143eed5a3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* WMF: Recreate the MFMediaSession when loading a new media.Yoann Lopes2012-12-078-47/+133
| | | | | | | | | | | | | | 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 <samuel.rodal@digia.com> Reviewed-by: Jason Barron <jason@cutehacks.com>
* WMF: Fixed shutdown sequence.Yoann Lopes2012-12-073-3/+4
| | | | | | | | | | | | 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 <samuel.rodal@digia.com> Reviewed-by: Jason Barron <jason@cutehacks.com>
* Fix includes to build on case-sensitive filesystemShawn Rutledge2012-12-072-2/+2
| | | | | | Change-Id: Ibd355256a5d2a60ee3a61ba2a2bf9f0f63c591cb Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update plugins.qmltypesKai Koehne2012-12-071-224/+63
| | | | | | | | Run with option nonrelocatable. Change-Id: I689d5d745dac9325aeb5db81484054b0dcdb9d24 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@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>
* Doc: Fix typo and enum namesChristian Stenger2012-12-062-4/+4
| | | | | Change-Id: I55a22d3a7c5fbdf2f8a16c09c701a7fa871a95e1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* fix build for standard DirectX install pathsJoerg Bornemann2012-12-061-1/+1
| | | | | | | | | 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 <oswald.buddenhagen@digia.com>
* Fixed build on MacOS with clang in C++11 mode.Erik Verbruggen2012-12-061-5/+5
| | | | | | | | | | 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 <andy.nichols@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* centralize and fixup example sources install targetsJoerg Bornemann2012-12-05407-271/+216
| | | | | | | | This follows suit with aeb036e in qtbase. Change-Id: Ie8580d0a1f38ab9858b0e44c9f99bdc552a1752a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* sync.profile: Point dependencies to 'refs/heads/stable'v5.0.0-rc1Sergio Ahumada2012-12-041-4/+4
| | | | | | | | | | | 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 <janne.anttila@digia.com>
* remove pointless QT.<module>.sources referencesOswald Buddenhagen2012-12-044-15/+15
| | | | | | | | 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 <joerg.bornemann@digia.com>
* WMF: Disabled the video probe control.Yoann Lopes2012-11-302-52/+57
| | | | | | | | | Using the video probe cause unstability in the video playback. Disabled for 5.0 release. Should be fixed and re-enabled in the next version. Change-Id: I274212a0943ac098194ad59d6e07bed7740bc8a3 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Doc: Added missing images and made some language editsVenugopal Shivashankar2012-11-3011-9/+54
| | | | | Change-Id: I9544121601c2c4099927e0e23550c3ab32bbfda9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* blackberry: fixed building without QtWidgetsOleg Shparber2012-11-291-7/+4
| | | | | Change-Id: I12103c5a4bd903b809e7db2ec8e1cbb60a37c429 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* tr()-Fixes.Friedemann Kleint2012-11-292-19/+19
| | | | | | | | Make WMF-player error message consistent (sentences, no exclamation marks). Improve wording. Change-Id: I876b26067fb374833037aa93dd9675ab556bf972 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Fix QGstreamerPlayerSession::availablePlaybackRanges()Andras Becsi2012-11-282-20/+15
| | | | | | | | | | | | | | | Since buffering information through buffering queries is only valid if progressive download buffering (on-disk caching) is enabled or local media is played and we explicitly disable on-disk buffering because of cleanup issues with gstreamer availablePlaybackRanges() always returns an empty range for online media. Seeking is also possible using http range requests therefore if valid playback ranges could not be determined we should return the [0..duration] range unless the source is a live stream or the duration is unknown. Change-Id: Idbebc0fdde5053c6f9c0b3794c6d122492c6239c Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Doc: cleanup multimedia overviewAndy Nichols2012-11-281-3/+10
| | | | | | | Added an introduction, and fix some formatting. Change-Id: Ic23416cf1113895a1895a53f310530a83a9013d3 Reviewed-by: Paul Olav Tvete <paul.tvete@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>
* Doc: Cleanup diagram placeholder in Camera OverviewAndy Nichols2012-11-271-4/+0
| | | | | | | | | The diagram still needs to be done, but is not necessary for the 5.0 release. Task-number: QTBUG-28235 Change-Id: I1e8b4d731c00516408de89be81d4ecb8bde3d016 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* QT7: Remove usage of QMAKE_MAC_XARCHAndy Nichols2012-11-231-7/+3
| | | | | | | | | Support for QMAKE_MAC_XARCH was removed in Qt 5.0, so it shouldn't be used in the QT7 plugin, as it causes build failures. Task-number: QTBUG-27180 Change-Id: I7d907a9afbcbc4989b794350c94d0f619e4d2b7d Reviewed-by: Caroline Chao <caroline.chao@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>
* AVFoundation: Enable QImage based frame fallbackAndy Nichols2012-11-215-22/+95
| | | | | | | | | | | QGraphicsVideoItem was not working because the QPainterVideoSurface was unable to paint BGR32 format OpenGL textures. Now if the QGraphicsView window has a QGLWidget viewport, we use the GLTextureHandle to render the video, otherwise we fallback to the software QImage rendered case. Task-number: QTBUG-28017 Change-Id: I9304e0a2536f15075ae34cdd509ef24fbc18604e Reviewed-by: Yoann Lopes <yoann.lopes@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>
* Doc: Polish the description of changes to the Qt Multimedia moduleSze Howe Koh2012-11-211-62/+46
| | | | | | | | | | | | | | | | - Fix errors - QtMultimediaKit is renamed to QMultimedia, not QtMultimedia - It's not necessary to explicitly convert metadata keys into strings -- Q_DECLARE_METADATA takes care of that - The introduction of MediaPlayer and VideoOutput does not affect existing code - Follow module naming guidelines at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation - Shorten descriptions, improve flow - Remove trivia Change-Id: I3ab9bb2f8f33cbea52b5993f3060d929a7e39ef1 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* AVFoundation: Fix broken requestControl logicAndy Nichols2012-11-201-6/+10
| | | | | | | | | | AVFMediaPlayerService::requestControl was returning the video output control after the video output was created, and this could result in unexpected behavior, as well as prematurely calling releaseControl on the video output. This should fix the "player" example on OS X. Change-Id: Ie23b1176272a1f9daa5edeec856141ac52a450c7 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Remove nonfunctional mediaDownloadEnabled propertyAndras Becsi2012-11-203-24/+3
| | | | | | | | | | | | | | I suppose this was introduced after an API freeze to try to support on-disk buffering but since the code does not set the GST_PLAY_FLAG_DOWNLOAD flag on the player element the feature is not only undocumented but also nonfunctional. If on-disk buffering is needed we should add proper API to enable/disable it for all backends which might be possible with Qt 5.1 the earliest. Change-Id: I6b42a06166509db0023a3e0263ecc3a36f0d2bdb Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 04:00:54 +0000