summaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Various fixes to Qt Audio Engine documentationJerome Pasion2013-10-038-18/+18
| | | | | | | | | | | -fixed \since to "\since 5.0" (Qt version 5.0) -made a \qmlmodule page so the list of related classes are automatically listed -made changes in the Qt Multimedia documentation to link to the Qt Audio Engine documentation Change-Id: Ibdd3da02871648988a73172934e684840c4ce0ae Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Removing version number from the QDoc comments.Jerome Pasion2013-10-0212-271/+271
| | | | | | | | | | The version is not needed anymore and QDoc handles them as a different module, causing errors. Task-number: QTBUG-32172 Change-Id: I55054a6c7bce9e001ef03cce944b03375c851d15 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Updated usage of \qmlmodule and \inqmlmodule.Jerome Pasion2013-10-0213-14/+14
| | | | | | | | | | -\qmlmodule denotes the import statement "QtMultimedia 5.0" -\inqmlmodule shouldn't have the version number and this commits removes it because it is confusing. Task-number: QTBUG-32172 Change-Id: I76f58ddd5ea2d5ae51eaae83a8408fd67611838a Reviewed-by: Martin Smith <martin.smith@digia.com>
* Android: refactor video renderer.Yoann Lopes2013-10-011-0/+7
| | | | | | | | | | | | | Removed the overhead of having to create a shared OpenGL context in the GUI thread and pre-render the frame into a FBO. We now directly render the GL_TEXTURE_EXTERNAL_OES in the QtQuick render thread, using an Android-specific QSGVideoNode. We also use a callback from the render thread to create the texture from there and not have to create a separate shared OpenGL context. Change-Id: I6c8eb94b47d0a03329c912701b8af3fb5ebd1876 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* VideoOutput: take the video format's scanLineDirection into account.Yoann Lopes2013-09-271-0/+6
| | | | | | Task-number: QTBUG-30442 Change-Id: Ic950d66cb35a937ccf3862089e0060819b6d6f34 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Fix "conversion from 'double' to 'float'" warnings on MSVC2010.v5.2.0-alpha1Mitch Curtis2013-09-241-12/+12
| | | | | Change-Id: I209d76fa2d87ad2eb540c750b8c4efb865441aae Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-042-0/+15
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf sync.profile Change-Id: I62a3095e4a4d507de199fac32b64e9e76323bbf4
| * Update all plugins.qmltypes filesLiang Qi2013-05-271-0/+13
| | | | | | | | | | | | | | Task-number: QTBUG-31388 Change-Id: Ia65490a262417f98fe69a89637ec2f9e7c0d0095 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Update qmldir file for QtAudioEngineLiang Qi2013-05-271-0/+2
| | | | | | | | | | Change-Id: I2fe64c72520a7b2b6b1d79bbddfdeb7d0bf4f977 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-2310-73/+147
|\| | | | | | | Change-Id: I24ffb71c4cc2e262394797deb8a22b2cf9a80c3c
| * Fixed signal not being emitted in QDeclarativeCameraFocus.Yoann Lopes2013-05-171-1/+4
| | | | | | | | | | Change-Id: If504ec5ecc59c46edeac24442181eedaacc7e5d8 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Decouple qmediametadata.h from qmultimedia.hSze Howe Koh2013-05-141-0/+1
| | | | | | | | | | | | | | | | 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>
| * VideoOutput: Take the surface's viewport into accountThomas McGuire2013-05-076-14/+74
| | | | | | | | | | | | | | | | Task-Number: QTBUG-30410 Change-Id: I480ce0bcd7ec136e54b5bfc5fec0e901141b72d8 Reviewed-by: Josh Faust <jfaust@suitabletech.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Doc: Fix missing element name in VideoMasaya TAKAHASHI2013-05-061-15/+15
| | | | | | | | | | | | Change-Id: I2237bf4a1da632f0528cfb9e6b32ea88f3930350 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * audioengine: update qmltypesFawzi Mohamed2013-04-301-43/+53
| | | | | | | | | | Change-Id: I13488291f543748716891cfa0ab9b5dd548ccc86 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-291-2/+0
|\| | | | | | | Change-Id: I0f0457e9863f540b7bd8bc104c92891d8cf5c483
| * remove pointless LIBS pathOswald Buddenhagen2013-04-261-2/+0
| | | | | | | | | | | | | | QT+=multimedia handles that already. Change-Id: Ifc3be513be10d89de3ea03f11f9d41d7d56d432b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-122-3/+3
|\| | | | | | | Change-Id: If2b8ea3be8fdaee2469c5d1c6b29c19dba1eb192
| * Doc: Fix minor typosSze Howe Koh2013-04-102-3/+3
| | | | | | | | | | | | Task-number: QTWEBSITE-514 Change-Id: Ie8f3689d18d15fd0e88e0ada4a745d9994d9c2ae Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Add autoOrientation property to QDeclarativeVideoOutputTobias Koenig2013-03-193-1/+59
|/ | | | | | | | | | | | The autoOrientation property is a flag to switch on/off automatic rotation of the video output, depending on the current screen orientation, to always show the output upright. This is useful when the VideoOutput is used as viewfinder for a Camera. Change-Id: I72753888592dc59c9adaa3343bfec8b168343229 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1965-90/+105
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/doc/qtmultimedia.qdocconf src/plugins/blackberry/mediaplayer/bbmetadata.cpp src/plugins/blackberry/mediaplayer/bbmetadata.h tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
| * Fixed a connection to a slot that doesn't existsTasuku Suzuki2013-02-131-1/+1
| | | | | | | | | | Change-Id: I7f94bab4e230996ace46d1c04d9d5a66ad9443d5 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Doc: Fix module name formatSze Howe Koh2013-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * WMF: enabled HW-accelerated video decoding for the QML video item.Yoann Lopes2013-01-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It also applies to QGraphicsVideoItem when used on a GL viewport. We now have a new video sink that is based on Microsoft's EVR sink, we just replace the default Presenter with our own. Frames are rendered into D3D surfaces using DXVA, then copied into a shared D3D/EGL surface and finally bound to a GL texture to be used by the video surface. The shared D3D/EGL surface is a feature provided by ANGLE and therefore Qt must be compiled with ANGLE for this new video sink to be compiled and used. Change-Id: I0b7b9968eed5488f9ef1a2dcca5213bd0af232ab Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Fixed QSGVideoNodes not deleting their materials.Yoann Lopes2013-01-153-0/+3
| | | | | | | | | | Change-Id: Ia7597ade3066c23c54354e2cc36c907e6bf0dfea Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * Doc: Fixed random QDoc warningsVenugopal Shivashankar2013-01-153-21/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| * Update copyright year in Digia's license headersSergio Ahumada2013-01-1064-64/+64
| | | | | | | | | | | | Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@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>
* | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-2826-104/+0
|/ | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Id95d10f5d9c146d9eb496119af6a8b8501ffcb17 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@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>
* Fix compilation with -no-rtti.Friedemann Kleint2012-11-191-1/+4
| | | | | | | | Availability of dynamic_cast should be checked. Task-number: QTBUG-27939 Change-Id: I24c0bca7859a45c6be89c507dadd91e7175939e0 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Blackberry: Enable support for audioengine if availableThomas McGuire2012-11-071-1/+2
| | | | | | | | BB10 ships OpenAL, so the audio engine works there. Change-Id: I49ba6201788cb41cabb1670522dc97a36fd5f2c2 Reviewed-by: Kevin Ottens <kevin.ottens.qnx@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix the bufferProgress property of QDeclarativeAudioAndras Becsi2012-11-071-1/+1
| | | | | | | | | | | | The bufferProgress property of QDeclarativeAudio is documented to hold how much of the data buffer is currently filled, from 0.0 (empty) to 1.0 (full) and should be declared to be of type qreal instead of int. The implementation was correctly normalizing the buffer status percentage to the [0, 1] range but the returned value was truncated to int in QML because of the faulty property declaration. Change-Id: I494c9cd14f4b3ec511759ae66a50e9f96bcb1452 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Rename namespace QtMultimedia -> QMultimediaSze Howe Koh2012-11-0611-38/+38
| | | | | | | | | | | | | | | | 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-064-208/+208
| | | | | | | | | | | | | | | | | | 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>
* Fix the QML list interfaceFriedemann Kleint2012-10-242-2/+2
| | | | | | | | | | | | | The QML list interface was changed, so that there is now a read only constructor and the default properties are removed. This is because the original interface was very runtime centric, like other parts in QML. The new interface was changed for the needs of the QML designer and debugger. Task-number: QTBUG-9390 Change-Id: Ia61a2457432b4fc5c0cf440eeebd9d3a6c4c6463 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Compile after removal of compatibility code in QtQuick.Friedemann Kleint2012-10-161-3/+3
| | | | | | | | | qtdeclarative: f21e9ba6efa2b1c8169491db271f79b87b5b0ce4 removed QQuickCanvas. Change-Id: Ica8ae4d816d1ca08f08d299cec741837a1a77c50 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Kai Koehne <kai.koehne@digia.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>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2466-1582/+1582
| | | | | | | | | 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 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>
* Hide the video overlay when the QML element is hiddenThomas McGuire2012-09-062-3/+15
| | | | | | | | An display invalid rect is used for invisible QML items. Change-Id: Ifb2a25f1c5387ab8cef1359ac6c3e2f90a42cd10 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
* Doc: Added an index page and separated \qmlproperty and \property documentationVenugopal Shivashankar2012-08-297-146/+340
| | | | | | Change-Id: I29bcfd0a31c781deb4cce2d6bcb2afca32191ae6 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com> Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Set the Qt API level to compatibility mode in all tests.Thiago Macieira2012-08-011-0/+2
| | | | | | | | | | Qt 5.0 beta requires changing the default to the 5.0 API, disabling the deprecated code. However, tests should test (and often do) the compatibility API too, so turn it back on. Task-number: QTBUG-25053 Change-Id: I9589f57998af237f2e89c7799789dae5a13ef634 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Doc: Changed \qmlclass to \qmltype and added \instantiatesJerome Pasion2012-07-2721-23/+45
| | | | | | | | | -New qdoc command \qmltype replaces \qmlclass -\instantiates <C++ class> for determining if the QML type has a C++ implementation Change-Id: I83d1e2c3f376f96ea51afedadf88c3cf478e33d8 Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Fixed QDoc errors related to snippets and quotefromfile commandsVenugopal Shivashankar2012-07-263-4/+7
| | | | | Change-Id: I9dd6381eb95dcbd9aa5cc8f596d87cf55eee7427 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Fixed the QDoc errors related to \qmlproperty usageVenugopal Shivashankar2012-07-242-2/+2
| | | | | | Change-Id: Ie4d5f8698fe8a1a774fd8f0bb127c20fc63a14e3 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Removed the playbackStateChanged signal from Video elementDmytro Poplavskiy2012-07-191-9/+0
| | | | | | | It conflicts with Video.playbackState property notifications Change-Id: I47901547e9db6f2b71e25c05ca8ce24c402eb5a2 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix QQuickCanvas renames.Toby Tomkins2012-07-181-2/+2
| | | | | | | | This is required because of name changes to QtDeclarative in the commit feb996e3ab44e68082c97102556ea396f5df3f44. Change-Id: Ia40b1ea1cf3b3cb5225b7678077b627b74c47132 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix for broken QML multimedia import on windowsMithra Pattison2012-07-161-2/+2
| | | | | | | | | | | Changed qtmultimediaquicktools into a module so that it gets installed to the bin directory. This allows the declarative_multimedia library to locate it during the 'import multimedia' process. Task-number: QTBUG-25984 Change-Id: I559469170bc713fb31633917bcbc210f862660cf Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 20:23:55 +0000