summaryrefslogtreecommitdiffstats
path: root/src/qtmultimediaquicktools/qtmultimediaquicktools.pro
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-10/+13
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I255dc22dc21d3629a41a8c2ae2076c48b594e626
| * Build without OpenGL supportAndy Shaw2019-10-241-10/+13
| | | | | | | | | | | | | | | | | | There is support for rendering video without OpenGL on most platforms although some features are unavailable as a result, so we can make sure that what is available can be used. Change-Id: I63938e8e4e8063fcc2064d0f9d8d5f10e0fb06f9 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | QtMultimediaQuick: Move headers from multimedia dirVaL Doroshchuk2019-05-091-5/+0
|/ | | | | | | Headers of multimedia quick module should not be placed in separate dir. Change-Id: Ie1f9df8339847ffbac8f22ac16ab0e613c46d037 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Rename the QtMultimediaQuick libraryYoann Lopes2017-05-021-1/+1
| | | | | | | | | Dropped the _p suffix from QtMultimediaQuick_p to be more consistent with other modules. Change-Id: Ibb0bbb2d24bc013df6c5623cba179508c5f1becf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Implement YUV 4:2:2 8bit support for QtQuickSamuel Gaist2016-04-291-2/+4
| | | | | | | | | | | This patch implements support for rendering of UYVY and YUYV sources when using QtQuick for preview. [ChangeLog][QtQuick][Rendering] Support for YUV 4:2:2 8bit has been implemented for the QtQuick viewfinder. Change-Id: I4d98f3c44240ee53f7708bc6bd84e7fb83aac069 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* rely on the automatically defined QT_BUILD_*_LIBOswald Buddenhagen2016-02-251-2/+1
| | | | | Change-Id: I8c1c755270aa0a703103925656f7c1b555e4db1f Reviewed-by: Yoann Lopes <yoann.lopes@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>
* Fix some private headers.Yoann Lopes2015-11-241-12/+13
| | | | | | | | | - Add missing "We mean it" comment - Add missing '_p' suffix for QtMultimediaQuick_p headers Task-number: QTBUG-49480 Change-Id: I1fd4f8b2fdffecebaebaedaf1b78e1da62c08156 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Minor refactor of built-in QSGVideoNodes.v5.5.0-beta1Yoann Lopes2015-04-301-0/+14
| | | | | | | | | | | - Load shader source from resource files. - Correctly report material types: each material can use different shaders depending on the video pixel format but it was reporting a unique material type. This was causing the node to keep using the same shader even if its pixel format changed. Change-Id: Ib903ecd6e7dd1dd56d7cefe255ab7049933df17d Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Add NV12/NV21 support into SG videonode.Timur Pocheptsov2015-03-201-2/+2
| | | | | | | | | Add new fragment shaders and update declarative render (video node) to support NV12/NV21 pixel format. Task-number: QTBUG-45021 Change-Id: I5d52007f0da56165752268d06efca156f7496b42 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Allow plugins to override the QML VideoOutput type.Andrew den Exter2014-01-201-2/+16
| | | | | | | | | Move QDeclarativeVideoOutput to the private QtMultimediaQuickTools library to make the QDeclarativeVideoOutputBackend interface implementable by a plugin. Change-Id: I763c483a1fc9ec56dc7b8be0bc71523f029a36ee Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* remove obsolete DEPENDPATH assignmentsOswald Buddenhagen2012-12-161-1/+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>
* Fix qmake warning about missing headers.Friedemann Kleint2012-11-191-2/+2
| | | | | Change-Id: I41caa02e09a4e0f81e6e5cbf3590c92fa0edaf68 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove usage of QT_MAKEDLL from QtMultimediaJoerg Bornemann2012-09-121-2/+0
| | | | | Change-Id: Ie427497c999c6d8d666b21cc5cc079036c505cc6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.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>
* 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>
* Mark QtMultimediaQuickTools library as internal.Stephen Kelly2012-07-241-0/+1
| | | | | | | | | | It does not install useful public headers (and those that it does install are installed to QtMultimediaQuick_p). This causes the avoidance of creation of CMake files. Change-Id: I7360f9c8e4b203ce0573c1cbfcc87d326e8f0d2f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix for broken QML multimedia import on windowsMithra Pattison2012-07-161-7/+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>
* build system cleanupsOswald Buddenhagen2012-06-251-2/+1
| | | | | | | | | | | | | | | | | - 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>
* Added loading of video node factories from pluginsJonas Rabbe2012-02-081-0/+30
This change will allow us to add new video node factories that can be loaded dynamically at runtime. The previous video node factories, I420 and RGB have been kept as static parts of the Qt Multimedia imports, but can be moved to plugins at a later date. For plugins to be able to find and use QSGVideoNode, the class has to be exported. Change-Id: Idbead9a8ad33619cebe90fcec92eb29cf52ae9bd Reviewed-by: Michael Goddard <michael.goddard@nokia.com>