summaryrefslogtreecommitdiffstats
path: root/src/multimediawidgets/multimediawidgets.pro
Commit message (Collapse)AuthorAgeFilesLines
* Remove qmake files from the repositoryLars Knoll2021-04-231-24/+0
| | | | | | Change-Id: I1131b555014a57e3224a8871de4cb1d01c406fd1 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* Get rid of QVideoWidgetControlLars Knoll2021-01-291-4/+0
| | | | | | | | | | | | | QVideoWindowControl offers more or less the same functionality, as both require a native surface to use for an overlay. This should in the longer term be re-architected towards a "native surface" interface for rendering. And the only platforms that did try to implement this were gstreamer and AVFoundation. Change-Id: I3adcc38dde9ccd20273c7a7fb1712ce97bbdad48 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Add a QMediaDeviceInfo class to enumerate input/output devicesLars Knoll2021-01-221-2/+1
| | | | | | | | | | | | | | | | | Use this as the starting point for a new QPA like backend infrastructure. Refactor places that use the device information to use the new infrastructure. Cleanup the audio subsystem part and port it over to the new infrastructure. Android and QNX are not ported yet. Change-Id: I99c459c998f1f05e1c40ad30c700011e41cef533 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Get rid of plugins for MM backendsLars Knoll2021-01-221-10/+4
| | | | | | | | | | There's no need for having those in plugins and we can further remove abstractions and simplify our code if the code is directly compiled into Qt Multimedia. Change-Id: I5267a6a776375d99be8f0de4207f0288d963e620 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Move the gsttools into Qt MultimediaLars Knoll2021-01-221-0/+1
| | | | | | | | | Let's not have a separate helper lib for those. The longer term goal is to get rid of platform specific plugins anyway. Change-Id: I24c9e984c696a4ecfc4693413ad51264f6926afe Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Kill QCameraViewFinderLars Knoll2021-01-221-2/+0
| | | | | | | | | The class didn't do anything beyond what QVideoWidget does, so simply replace it's usage by QVideoWidget. Change-Id: Ieb2931ea2e98f0f289d9d8ee45745ca9e55226fd Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Quick: Allow to build with -no-openglVaL Doroshchuk2020-06-101-3/+5
| | | | | Change-Id: I927998b9ffa80a324636855c5dcc92cb57e9d520 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Update qtbase dependencyFriedemann Kleint2020-03-251-1/+1
| | | | | | | | | - Adapt to QOpenGLWidgets split - Use new Q_MOC_INCLUDE directive where required - Fix QtConcurrent usage Change-Id: I9de650ae4fbbd397ef4fd4650c8aa5a0443d566f Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
* Fix false pulse audio dependency of libQt5MultimediaWidgetsJoerg Bornemann2020-02-161-1/+2
| | | | | | | | | | | The assignment 'QT += multimedia-private' exports multimedia-private's pulse audio dependencies. Fix this by using 'multimedia' as public dependency and 'multimedia-private' as private dependency. Fixes: QTBUG-62626 Change-Id: I156b705706567d9cde1dd0f44c75acb36938384d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
* MultimediaWigets/MSVC2013: Increase virtual memory range for PCH, take 2v5.10.0-beta2Friedemann Kleint2017-10-191-0/+2
| | | | | | | | Limit to MSVC2013 as later version supposedly have smarter allocation. Task-number: QTBUG-63724 Change-Id: Iaf7e98796e882e6a59f200baabec8d16e5c4a5c7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Revert "MultimediaWigets/MSVC2013: Increase virtual memory range for PCH"Friedemann Kleint2017-10-161-2/+0
| | | | | | | | | | | It turns out that the change does not help. The problem is related to insufficient virtual memory at boot-up. This reverts commit c1f3e76b4d5d84d7e6b22076191a737908924e72. Task-number: QTBUG-63724 Change-Id: I4df17d8f2c48684c732267432a4bc090b712083f Reviewed-by: Liang Qi <liang.qi@qt.io>
* MultimediaWigets/MSVC2013: Increase virtual memory range for PCHFriedemann Kleint2017-10-131-0/+2
| | | | | | | | Limit to MSVC2013 as later version supposedly have smarter allocation. Task-number: QTBUG-63724 Change-Id: Ifdbbe3997843de4f00e279d5bfd4a75846567541 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fix build with -no-feature-graphicsviewPaul Olav Tvete2017-03-071-2/+6
| | | | | Change-Id: Id5f0f90b816e878f828dd246b36ea3b4fc444e87 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Cleanup all maemo/meego specific codeLars Knoll2016-11-141-17/+1
| | | | | Change-Id: I6c6f28084c6b030928eebc53c5d0009b168ede6a Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Adjust to qtConfig() changes in qtbaseLars Knoll2016-08-191-5/+2
| | | | | | Change-Id: I26d80ece18abf882338de5ce0258469ed103a0eb Reviewed-by: Yoann Lopes <yoann.lopes@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-2/+2
| | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I8e1554b648327ea2fb342b882ce8e439bd6f271d Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Doc: Move all doc artifacts under one projectVenugopal Shivashankar2015-12-071-2/+0
| | | | | | | | | Although the Qt Multimedia module has two submodules, a single project is sufficient to document these submodules, avoiding unnecessary maintenance overhead. Change-Id: I8fab48241b5c9aba35890a8aaa28ce7154f78c45 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* use private linkage where possibleOswald Buddenhagen2013-10-311-1/+1
| | | | | | Task-number: QTBUG-34463 Change-Id: Iffbeed2f1a27fd38b5960afa9715815ac11b722a Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* AVFoundation: Remove QVideoSurfaceCoreGraphicsPainterAndy Nichols2013-08-261-8/+0
| | | | | | | | | This was a leftover from Qt 4, as it is no longer possible to use the CoreGraphics paint engine. Instead we should just use the logic in QPainterVideoSurface render the QVideoFrame. Change-Id: I7e97fe7c30fd478dcd405d300e0c3f70050ca25f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* iOS: Fix build issuesAndy Nichols2013-03-111-1/+1
| | | | | | | | This also prevents anything meaningful from working, but it is a good starting point. Change-Id: Idaf495ec29f611ee5342c79318bc3ace1d852747 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Adding Qt Multimedia Widgets documentation.Jerome Pasion2013-02-261-1/+2
| | | | | | | | | | | -added landing page and module page -linked to Qt Multimedia and Qt Widgets -excluded multimediawidgets dir from the Qt Multimedia documentation Task-number: QTBUG-29339 Change-Id: Iaa8dc4117505d5635b8cab97ed5c10e9c4a289e6 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.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>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-111-1/+1
| | | | | | | 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>
* 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>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-121-2/+0
| | | | | Change-Id: Ie07a32729ec8679f799613f8f6ccdd9c1b6bf7c9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Re-enabled CIImage based gfx video item on MacDmytro Poplavskiy2012-08-271-2/+1
| | | | | | | | | 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>
* 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-111-1/+1
| | | | | Change-Id: I6fd02095b9c75952c689b2c55aec9c71b39aadd3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-251-7/+2
| | | | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - pointless DEFINES+=QT_MAKEDLL - pointless and commented out include and depend paths - qmake -project boilerplate Change-Id: I8f4586403848fe8f2dff4e889b389956ffcdea59 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-251-3/+3
| | | | | Change-Id: I19285dfef7294e813ec241a8f6f00a804d56df49 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Move QVideoWindowControl out of widgets.Thomas McGuire2012-04-251-4/+2
| | | | | | | | There is no widget dependency in it, and this enables the QML Video element to support video overlays later. Change-Id: I7ebcde350f9595a9f7c319663ff745930535a8a7 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Don't use QT_ARCH to detect ARM or OpenGL ES 2 on ARMBradley T. Hughes2012-02-221-1/+1
| | | | | | | | | | | Use Q_PROCESSOR_ARM instead of QT_ARCH_ARM. On maemo6, don't use QT_ARCH==armv6 to conditionally include egl code. Instead check for opengles2 in QT_CONFIG, which is detected by the configure script. Change-Id: Ib3062fbd81c3a3acd318df32c49ad133a5b0d07c Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QtMultimedia: Remove qpa-sections from .profiles.Friedemann Kleint2011-11-011-7/+8
| | | | | | | Prepare for removal of the -qpa configure option. Change-Id: Ibf4be58231d29cd972eb765f32b410e1eb9d7fed Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Rename QtMultimediaKit to QtMultimedia.Michael Goddard2011-10-071-0/+68
There are a few legacy bits left in place so it passes CI, and then qt5.git etc can be updated. Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a Reviewed-on: http://codereview.qt-project.org/5368 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>