summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Doc: Fixed random QDoc warningsVenugopal Shivashankar2013-01-1526-67/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | | Added seek() function to QML Video item and updated documentation.Yoann Lopes2013-01-151-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Video item inline example was wrong, changing read-only properties. Task-number: QTBUG-28741 Change-Id: Ia1f6c1110a301a96743e7ebfec51731fcaf6a862 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
* | | Fix: Bug fix in determination of scanline directionWouter Huysentruit2013-01-142-6/+33
| | | | | | | | | | | | | | | | | | | | | YUV and other compressed frame formats are always TopToBottom. Only for uncompressed RGB formats the sign of their height is used to indicate the scanline direction. Change-Id: I6474783583672861eeeb538b79d14ee3d6995f59 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
* | | Fix: Only flip video once for BottomToTop scanline directionsWouter Huysentruit2013-01-141-23/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Top & bottom of the texture coordinates are already flipped for BottomToTop scanline directions. So there is no need to flip top & bottom of the vertex coordinates too. Change-Id: I221b94afb65c194bdedb787414e6a436b8095fb2 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
* | | make use of qtHaveModule()Oswald Buddenhagen2013-01-1116-24/+22
| | | | | | | | | | | | | | | | | | | | | 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>
* | | tst_bic: Add test data for linux-gcc-ia32Sergio Ahumada2013-01-113-0/+9583
| | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-321 Change-Id: I51cabb707107ae6cc788ff04b0886dc3d06b3693 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | | Update copyright year in Digia's license headersSergio Ahumada2013-01-101002-1002/+1002
| |/ |/| | | | | | | | | Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | WMF: added more metadata keys (on Windows 7 and later).Yoann Lopes2013-01-081-5/+216
| | | | | | | | | | | | Change-Id: I01eebd0582d33eb3d581176bba2a84fa75db2463 Reviewed-by: Jason Barron <jason@cutehacks.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Compile in 32-bit mode.Morten Johan Sørvig2013-01-083-6/+6
| | | | | | | | | | | | | | | | | | | | CGRect == NSRect only in 64-bit mode. Don't add -framework QuickTime based on the host arch, use QT_ARCH instead. Change-Id: I829bc1bcfe37f70a07e8c55a5bc7dee90aaa981a Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | remove leftover code from multimediawidgets carve-outOswald Buddenhagen2013-01-081-5/+0
| | | | | | | | | | Change-Id: Ibb347193761a94ce4a309eddb75af37b73dd9be6 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* | WMF: release video controls before releasing the sessionYoann Lopes2013-01-075-3/+24
| | | | | | | | | | | | | | | | | | For the VideoRendererControl, also stop the video surface at the same time. This fixes a crash when changing video. Change-Id: I49484f8b277c345dafb3e5947cf5d23df15546f3 Reviewed-by: Jason Barron <jason@cutehacks.com>
* | WMF: Fixed uninitialized member variable.Yoann Lopes2013-01-071-0/+1
| | | | | | | | | | Change-Id: Iee60d6eee7bbf9dd7804216f4a49c4549f41ba5a Reviewed-by: Jason Barron <jason@cutehacks.com>
* | WMF: re-enabled video probes and made it more robust.Yoann Lopes2013-01-075-67/+163
| | | | | | | | | | | | | | | | | | | | | | | | Fixed the way the custom MF Transform (getting the frames) works: - Recreate it whenever we load a new media - During media type negotiation between nodes, the MFT should support the same types as the video sink supports - Allow input and output types to be changed as many times as needed, otherwise the topology cannot be resolved in some cases Change-Id: I7ca77e1a3dee83643f1a97f2e6ada9c5c0e88309 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Make QtMultimedia an identified moduleOleg Shparber2013-01-041-0/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-28376 Change-Id: I7b27dc52b3085eb50695e559029f2533aa743d4f Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | 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>