summaryrefslogtreecommitdiffstats
path: root/src/src.pro
Commit message (Collapse)AuthorAgeFilesLines
* Move qtmultimedia over to the new config systemLars Knoll2016-11-141-1/+4
| | | | | | | | | | | | Use the new configuration system to define external libraries, configure tests and features. Don't use pkg-config outside of the configuration step. And move all command line options over from qtbase, so that we can remove them from there in a second step. Change-Id: I1aa4b557a6aee17eeceb00602005a2d28b426a26 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* Adjust to qtConfig() changes in qtbaseLars Knoll2016-08-191-1/+1
| | | | | | Change-Id: I26d80ece18abf882338de5ce0258469ed103a0eb Reviewed-by: Yoann Lopes <yoann.lopes@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fix build when building with QT_NO_OPENGLAndy Nichols2016-06-281-1/+1
| | | | | | | | | | | Now that it is possible to build qtdeclarative when QT_NO_OPENGL is defined, it is no longer safe to assume qtHaveModule(quick) == OpenGL. So for the time being building of qtmultimediaquick tools is disabled when qt is built without opengl support, as the implementation depends on OpenGL currently. Change-Id: Iec76d25c5a86ee16674bf433c492585ad5f87988 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Declare videonode dependency on Qt5MultimediaQuick_pLevy, Lawrence-Jacques2015-09-211-0/+3
| | | | | | | Change-Id: I896fda1689dba502380956c0b7a8a4e6b05a1e3a Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-111-2/+2
| | | | | | | 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>
* The qt quick imports are build only if qtdeclarative is presentCorentin Jabot2012-08-021-8/+11
| | | | | | | | | If the declarative module is not present, the qtquick/qml plugins in the imports directory will not be build Change-Id: I2393b8302f75cbb94d3a85bd70f575817a0a3c34 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* switch to new-style configure testsOswald Buddenhagen2012-06-251-1/+1
| | | | | Change-Id: Ib56d0cb24065c1f990aee5d7f41bfedfe75332a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* add multimediawidgets before gsttools to SUBDIRSOswald Buddenhagen2012-06-011-7/+7
| | | | | | | | the build dependency does not override the qmake processing order, but this will become important soon. Change-Id: I8ef88285f9c12829080e6f5e1cc0349dd59f83b8 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Split gstreamer plugin into smaller plugins providing fewer servicesJonas Rabbe2012-04-271-0/+3
| | | | | | | | | | | | | | The gstreamer blob has been split into four plugins: audiodecoder, camerabin, mediacapture, and mediaplayer. Note: camerabin is still disabled because it is untested camerabin2 implementation. A new qmake configuration use_gstreamer_camera has been introduced and is needed for the mediacapture plugin to expose the camera service. This configuration has been disabled by default. Shared functionality has been moved to the internal gsttools library. Change-Id: Ifb2604f440cfa97513d39f5d7978766c88eaec45 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed possible dependency problem in the qmake structureJonas Rabbe2012-02-081-1/+7
| | | | | | | | | If gstreamer is present, then the gstreamer plugin (and hence the plugins sub directory) should depend on the gst tools library. Change-Id: I6012df02d14731107fc0656089aa27ae61f0ef71 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Added loading of video node factories from pluginsJonas Rabbe2012-02-081-2/+7
| | | | | | | | | | | | | | | 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>
* Use relative instead of absolute SUBDIRS, as usual.Rohan McGovern2012-01-181-4/+4
| | | | | | | | | | There doesn't seem to be any reason for using the full path to subdirs here. Using the full path is unconventional, and it causes the makefile targets to be named after the full path to the subdir, which is unnecessarily long and also unpredictable. Change-Id: I88361b50a4814b5b063f6d84bc68ff6955af1960 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove widgets config test.Michael Goddard2012-01-111-1/+1
| | | | | | | | | Since it's not guaranteed that other Qt modules will be built by the time qmake is run (and config.tests are created) we can't rely on compilation. Just check the module.pri variable for widgets instead. Change-Id: I352cf6427b748b89b69ec17588ce0dd83065090f Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Properly handle the case where QtWidgets is not available.Michael Goddard2012-01-061-11/+22
| | | | | | | | | | | | | | | It does use a config test for now, just to make it clearer. The Mac backend currently requires widgets, but most of the others should work without it (just not supporting QVideoWidget/WindowControl). The QVideoDeviceControl interface was modified to remove the QIcon usage - it was never implemented. Unfortunately even the QML examples need widgets for the wrapper application, and will need to be ported to QtGui based wrapper. Change-Id: I8a55ad5cf09ab51749510bf16f49de0bd3f0bcdb Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Moved general gstreamer helper classes into separate library.Jonas Rabbe2011-10-121-1/+8
| | | | | | | | | | Cleaned up configuration of gstreamer with a separate config test. Change-Id: I1ec9ee466233687fbcfdc544a12d9fce578e4379 Reviewed-on: http://codereview.qt-project.org/6459 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Rename QtMultimediaKit to QtMultimedia.Michael Goddard2011-10-071-4/+4
| | | | | | | | | | 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>
* Try to move widget/gvitem code into new QtMultimediaKitWidgets lib.Michael Goddard2011-08-251-0/+4
| | | | | | | Change-Id: I522b3e6d4465c6c5cce2483676e09320176837d6 Reviewed-on: http://codereview.qt.nokia.com/2665 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Remove Symbian packaging information.Michael Goddard2011-06-291-4/+0
| | | | Needs to be redone/done differently, anyhow.
* Initial copy of QtMultimediaKit.Michael Goddard2011-06-291-0/+12
Comes from original repo, with SHA1: 2c82d5611655e5967f5c5095af50c0991c4378b2
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 12:30:25 +0000