summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | add install path to ruleMaurice Kalinowski2012-10-221-0/+3
| | | | | | | | | | | | | | | | fix installation into prefix directory. Change-Id: I6838589e2e186d4f23d240e0e7c2772a46af3a9d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | Fix for QuickTime 7 media player backendCaroline Chao2012-10-193-16/+33
| | | | | | | | | | | | | | | | | | Fix build on Mac 10.6 (32bits) Task-number: QTBUG-27179 Change-Id: If0b83605650966bf801b5fbb06d02c113d0b4214 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | Add MediaPlayer support to AVFoundation pluginAndy Nichols2012-10-1925-1/+3591
| | | | | | | | | | | | | | | | | | | | This plugin would be used on Mac 10.7+ where without the QuickTime C API our QT7 media player performance was crippled. Change-Id: Iaadb1990a8f63393c4cd02d096624e0fed42b40f Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Jason Barron <jason.barron@digia.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | Doc: Removed dependency on qtmultimedia.cssVenugopal Shivashankar2012-10-191-5/+0
| | | | | | | | | | | | | | | | All module documentation must use the global HTML template and style sheet in qtbase\doc\global. Change-Id: Ia7db9373f2291052924f433223a128ef4c2c3df8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Make QGstreamerPlayerSession 'VAAPI-aware'.Yoann Lopes2012-10-172-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment the GStreamer player pipeline is not setup properly when the VAAPI plugin is available, resulting in no video being shown. Added 'video/x-surface' as one of the default raw formats for the decodebin. Don't use vaapidecode when the video sink is not compatible. This is a preliminary patch to support VAAPI. In the current state vaapidecode will never be used as none of our video sinks support the video/x-surface format. Change-Id: I39f339b483d4052dd1e29c2b0ef06343d5670224 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | QtMultimedia: Fix compiler warnings.Friedemann Kleint2012-10-173-3/+3
| | | | | | | | | | | | Change-Id: I5783b1f6dce645fb473e7d3da0911dbb40e3951b Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Fix compilation with stock MinGW.Friedemann Kleint2012-10-173-8/+27
| | | | | | | | | | | | | | | | | | | | Use qt_windows.h, provide interfaces and UIDs missing in stock MinGW. Task-number: QTBUG-23829 Change-Id: I79ed902bb7636c751df7607f6059a7de237acb31 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Compile after removal of compatibility code in QtQuick.Friedemann Kleint2012-10-162-4/+4
| | | | | | | | | | | | | | | | | | qtdeclarative: f21e9ba6efa2b1c8169491db271f79b87b5b0ce4 removed QQuickCanvas. Change-Id: Ica8ae4d816d1ca08f08d299cec741837a1a77c50 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Remove unused value in qvideowidget.cppCaroline Chao2012-10-131-2/+0
| | | | | | | | | | | | | | Following change: 439d5b0e53f564dc75e427743ccce75c6a62f1c6 Change-Id: I111a87578844bb3c18819285ae9509e0f2c408d9 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Don't run the Linux configure tests on OS XAndy Nichols2012-10-121-4/+2
|/ | | | | | | | | | | This can create weird senarios where they pass due to MacPorts actually having the dependencies. We don't support this, so dont allow it to happen. Task-number: QTBUG-27352 Change-Id: I2be104549b5d1e9a61a734d05b3c21afcd2f6828 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Enable the auto test script to run on OS XAndy Nichols2012-10-121-0/+5
| | | | | | | | | | Only a few test could be run on OS X because they were not stored in an application bundle. Now on OS X we check for the application bundle for a test in the runautotests.py script. Change-Id: If9e3f343f5005ecfe4a83d8282564d1309b4379e Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jason Barron <jason.barron@digia.com>
* Update docs after modularization of docsTor Arne Vestbø2012-10-117-801/+5
| | | | | | | | | | | The global files now live in qtbase only, and are made available to the other modules via the $QT_INSTALL_DOCS variable. We now use QMAKE_DOCS to trigger doc generation instead of rolling our own rules for qdoc. Change-Id: I900029d71c305a1f269cddeeb0e05c524d933834 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Build fix after a QVariant changeJędrzej Nowacki2012-10-101-4/+4
| | | | | | | QVariant(Qt::GlobalColor) ctor was removed in Qt5. Change-Id: If272ff26003cdc58eb3decf5030e927134d126b0 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix issue sharing OpenGL context from render thread on OS XAndy Nichols2012-10-092-1/+24
| | | | | | | | | | | On OS X when running in QtQuick 2 examples in debug mode we fail an assert because we try to set a dynamic property using QObject::setProperty from the render thread, while the object exists in the main thread. Now we call setProperty from the correct thread. Change-Id: I3f26ead0f68fadcded472bf5c9014a4025f0a03e Reviewed-by: Christian Stromme <christian.stromme@digia.com> Reviewed-by: Jason Barron <jason.barron@digia.com>
* Added config test for AVFoundation frameworkAndy Nichols2012-10-093-0/+54
| | | | | Change-Id: Ifd152513074e6b7802a3ed6d4722ba78762ec79c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fixed AVF camera backend build with namespaced QtDmytro Poplavskiy2012-10-093-4/+6
| | | | | | | | Objective-C declarations may only appear in global scope, moved them out of Qt namespace Change-Id: Icb136be75f544e5929ac28f0ba0681211b81a983 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Export QAudioHelperInternal symbolsKevin Ottens2012-10-081-1/+1
| | | | | | | They can be useful to some of the audio plugins. Change-Id: I10856c104770ed57c72b674829e3922b5067a822 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Don't add the beginning of the file to the end of the last periodKevin Ottens2012-10-081-2/+3
| | | | | | | | | | If we're in the last loop, it is not necessary to provide a full period on read. Just provide the remaining of the data and hit the end of the stream by returning less than requested, otherwise we potentially generate some garbage noise. Change-Id: I9d3a632ddc0c3289957c9f876d5dbe2999b50ebd Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Blackberry: Move the mediaservice plugin in a subdirectoryKevin Ottens2012-10-0815-32/+37
| | | | | | | | | Move the current platform plugin content in a subdir in order to make room for several plugins (at least an extra one will be needed for the audio type). Change-Id: If17d6a464e36014fbefda52ddb0e8f8a58697f48 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Doc: Added Qt Multimedia to 'qmlmodules' groupJerome Pasion2012-10-031-1/+2
| | | | | | | | | -'qmlmodules' contains Qt's QML API -made brief description consistent with other QML API Change-Id: I30473048b06e2a4e13deb57c394a12c51a11693b Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.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-012-9/+8
| | | | | | | | | | 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: Organized related information in subsectionsVenugopal Shivashankar2012-09-281-46/+40
| | | | | Change-Id: Iabe4a032d998003b659e298c3d602d68d83de8b1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Add missing QT_{BEGIN,END}_NAMESPACESergio Ahumada2012-09-273-0/+6
| | | | | Change-Id: I85bbd4f711191c14d6f58f098fced7336c66308f Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Doc: Moved example documentation and imagesVenugopal Shivashankar2012-09-2629-0/+0
| | | | | | | | | 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>
* Doc: Adding documentation templates from qtbaseJerome Pasion2012-09-253-0/+751
| | | | | | Task-number: QTBUG-27293 Change-Id: I86ca7bbb5bb2899617f3a2afb56183110666f71a Reviewed-by: Martin Smith <martin.smith@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-24988-21719/+21719
| | | | | | | | | 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>
* Fix missing internal module in sync.profileAndy Nichols2012-09-241-0/+1
| | | | | | | | | Build was broken for shadow builds because qtmultimediaquicktools was not listed in sync.profile Change-Id: If9d23906dbd37b651a545ae810ee9883b6a23348 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix gstreamer plugin build for platforms with qreal -> floatRomain Pokrzywka2012-09-141-1/+1
| | | | | | | | | | simple case of qFuzzyCompare with double and float. I kept m_volume as double rather than changing it to float, to mimic the behavior of the mute variable. Change-Id: Ife2f58f60738215ebd430ba94bef885c09994e72 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
* Doc: Updated landing page to be consistent with other module landing pagesVenugopal Shivashankar2012-09-133-29/+70
| | | | | Change-Id: Ib230a7c01f2573b08f0a505fb0ada80d01757ba7 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Doc: Removed the unnecessary \annotatedlist command to avoid duplicationVenugopal Shivashankar2012-09-121-3/+7
| | | | | | Change-Id: I5b1b42ed2b94735ff758e0e93e8df8eb5ab73a0f Reviewed-by: Martin Smith <martin.smith@nokia.com> Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* remove usage of QT_MAKEDLL from QtMultimediaJoerg Bornemann2012-09-123-38/+4
| | | | | Change-Id: Ie427497c999c6d8d666b21cc5cc079036c505cc6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove references to qMemSet & qMemCopyOswald Buddenhagen2012-09-123-6/+6
| | | | | Change-Id: Ie6e24798368305fb1eaa01d0e5fccdb5bb5aa33b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-1220-42/+1
| | | | | Change-Id: Ie07a32729ec8679f799613f8f6ccdd9c1b6bf7c9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix compilation after the qreal->float change in Math3DThiago Macieira2012-09-121-1/+1
| | | | | | | | QVector3D::length() returns float now, so this qBound call was running into template substitution failure. Change-Id: Ib03ab96bf18a4b04fa80a8f706761329faab2541 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Blackberry: Add Q_DECL_OVERRIDE keywordsThomas McGuire2012-09-064-45/+45
| | | | | Change-Id: Ibd6cf76ac41e16cbf65182994d68eb81c315f0af Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Hide the video overlay when the QML element is hiddenThomas McGuire2012-09-063-3/+18
| | | | | | | | An display invalid rect is used for invisible QML items. Change-Id: Ifb2a25f1c5387ab8cef1359ac6c3e2f90a42cd10 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
* Blackberry: Use debug output for errors by defaultThomas McGuire2012-09-051-12/+4
| | | | | | | This makes diagnosing problems remotely a lot easier. Change-Id: I23434af5e88fb8dcdb154be34f12276eba652d4f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* WMF Backend: Fix crash in MFPlayerService::releaseControl.Jason Barron2012-09-041-0/+2
| | | | | | | | | | | When releasing a video render control or a video window control, we were deleting the object pointed to by the 'control' pointer, but were not setting this pointer to 0 which left it dangling. Shortly after we tried to cast this dangling pointer to another type which crashed. The solution is just to return after deleting the control. Change-Id: I9ab672c8b86a13af889d87c76141e6b8db5b74a7 Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* Make compile with -no-widgetsTasuku Suzuki2012-09-041-8/+10
| | | | | Change-Id: I6a057950315a1e2084fd6fc130007f865d096f12 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update the git-archive export optionsThiago Macieira2012-09-032-0/+4
| | | | | | | | | | | | | | The .gitattributes and .gitignore files do not need to be present in packaged sources, as they are for people using the Git repository. People who download tarballs usually don't reimport into Git -- they should just download the actual repositories. Meanwhile, the .tag file is quite useful. Instead of making Git extract to the useless SHA-1 of the $n string, ask git-archive to store the SHA-1 of the commit being packaged. Change-Id: I7f56327b21264dfd32d5d2519ca49aa1453083d2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove useless dependency in qmlvideofx.proTasuku Suzuki2012-09-031-1/+0
| | | | | Change-Id: Ie79cc9294f3845c089525195684df4a60171f78c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Doc: Added an index page and separated \qmlproperty and \property documentationVenugopal Shivashankar2012-08-2913-199/+444
| | | | | | Change-Id: I29bcfd0a31c781deb4cce2d6bcb2afca32191ae6 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com> Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Camera integration test fixesv5.0.0-beta1Dmytro Poplavskiy2012-08-281-11/+11
| | | | | | | | | | Skip the testCtorWithDevice test if camera doesn't support devices selection; Allow synchronous camera status changes Change-Id: I14f4a74f8a92b8dc2f75f8f5df2bcf9c124bda68 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Initial implementation of Mac camera backendDmytro Poplavskiy2012-08-2727-0/+3009
| | | | | | | Based on AVFoundation framework Change-Id: If4cfd105a592f50b42606624548b9ffc870e3e47 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Re-enabled CIImage based gfx video item on MacDmytro Poplavskiy2012-08-275-12/+15
| | | | | | | | | Also prefer CoreImageHandle to GLTextureHandle in QuickTime player backend, to avoid unnecessary copy via FBO. Change-Id: Id5aa039c438378b7bbf816b7845b05574683c471 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Use Qt::WindowFlags, not Qt::WFlags.Stephen Kelly2012-08-132-4/+4
| | | | | | | | | The latter seems to date from the Qt 1 days, and such abbreviations are not current Qt style. Change-Id: I576a04e60c59e0bdf60da9c07e4d2917fc02a491 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* make use of QT_PRIVATE to specify private Qt dependenciesOswald Buddenhagen2012-08-111-7/+5
| | | | | Change-Id: I339de1ebc3cde795a3b4a258f3899bd5658a1f54 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-113-3/+3
| | | | | Change-Id: I6fd02095b9c75952c689b2c55aec9c71b39aadd3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 12:08:04 +0000