summaryrefslogtreecommitdiffstats
path: root/config.tests
Commit message (Collapse)AuthorAgeFilesLines
* ALSA: simplify checking the available version.Lisandro Damián Nicanor Pérez Meyer2016-03-101-1/+1
| | | | | | | | | | | Make use of SND_LIB_VERSION instead of SND_LIB_[MAJOR MINOR SUBMINOR] in order to simplify the tests. Task-number: QTBUG-51681 Change-Id: Ib9f28ff15ddc643cc426ded3a5779fb4ff651139 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Port DirectShow backend to winceAndreas Holzammer2016-03-092-1/+3
| | | | | | | | | | | | | | | | | | | | | | dshow.h needs to be included before Qt headers as they include the windows header with NOMINMAX macro set. DirectShow header needs min/max macro definition to compile. The min/max macro then conflicts with QDateTime header, hence needs to be undefined again for some occasions. Windows Embedded Compact then defines INTERFACE as macro, which conflicts. Windows Embedded Compact does not support audio end point selection. Feature has been disabled for this platform. Windows Embedded Compact does not support setting meta data, control has been disabled. Windows Embedded Compact does not support VMR, feature was disabled. Direct Show renders always top to buttom. Change-Id: Id17700835e2105fb127b12e3448bea16e3b52546 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-071-1/+1
|\ | | | | | | | | | | | | Conflicts: src/plugins/android/src/wrappers/jni/androidcamera.cpp Change-Id: Ibb34f710b1dfb9a23b378462f31432581c6c26f4
| * alsa: Relax ALSA version checks for 1.1.x to be detected.Raphael Kubo da Costa2015-11-271-1/+1
| | | | | | | | | | | | | | | | | | Relax the check for SND_LIB_MINOR and SND_LIB_SUBMINOR so that ALSA 1.1.x is not considered older than 1.0.10. QtMultimedia builds fine with ALSA 1.1. Change-Id: If697c34cc7d9bbe2f2a3413d0c25ac4de4e93b34 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Remove unused configuration test.Yoann Lopes2015-11-052-49/+0
|/ | | | | Change-Id: Id406146995dfb0dd8534a00b62c471d430a7366f Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Update copyright headersAntti Kokko2015-02-1218-157/+141
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I1c6faa4f59f8eca54f01ef20941fa60161dd7872 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* GStreamer: port to 1.0.Yoann Lopes2014-11-274-29/+23
| | | | | | | | | | | | | | | 0.10 is still used by default. To enable GStreamer 1.0, pass GST_VERSION=1.0 to qmake for qtmultimedia.pro. Contributions from: Andrew den Exter <andrew.den.exter@qinetic.com.au> Ilya Smelykh <ilya@videoexpertsgroup.com> Jim Hodapp <jim.hodapp@canonical.com> Sergio Schvezov <sergio.schvezov@canonical.com> Change-Id: I72a46d1170a8794a149bdb5e20767afcc5b7587c Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-014-2/+54
|\ | | | | | | | | | | | | | | | | Conflicts: src/gsttools/qgstreamervideoinputdevicecontrol.cpp src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp Change-Id: Ic854589562d2deeaa0ebf75840cb8a2ee32e99de
| * Restore QWindowsAudio support on wince.Bjoern Breitmeyer2014-08-272-2/+6
| | | | | | | | | | | | | | Enabled Audio playback with wave device on WindowsCE again. Change-Id: Ic7749821ef8f991a909cbeb29083219ea988f5dc Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Detect V4L availabilityLisandro Damián Nicanor Pérez Meyer2014-08-182-0/+48
| | | | | | | | | | | | | | | | | | | | Do not build related stuff if not found. Makes GStreamer support available on Hurd. Task-number: QTBUG-39762 Change-Id: I1f70b6975e5bef99ab2441aac4d90508bc8b64bd Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Update license headers and add new license filesAntti Kokko2014-08-2416-303/+175
|/ | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: Ied06887225df341064c12bcc14c259ae74116f2e Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* enable imx6 specific QSGVideoNode based on a config testMichael Olbrich2014-03-042-0/+51
| | | | | | | | This way it also works custom mkspecs Change-Id: I7414aac775b797da3487e9625c7212486118b532 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* AVFoundation: Improve config testAndy Nichols2014-03-032-1/+3
| | | | | | | | | This should prevent the avfoundation plugin from being built on system that can not support using it (ex. 32bit builds on OS X 10.7) Task-number: QTBUG-36239 Change-Id: I9f861b7580b0e015ddbc1231440d677bf6eee1ec Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Add mmrenderer configure checkv5.2.0-rc1Andreas Holzammer2013-11-252-0/+56
| | | | | | | | | | | No all QNX versions/variations have a mmrenderer by default, so we need to check for it, otherwise it fails to compile. Change-Id: I3efe9df37cf7807c1b0ac4d2e8f49aa02e3408cd Reviewed-by: Frank Osterfeld <frank.osterfeld@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* OpenSL ES: enable the plugin only on Android.Yoann Lopes2013-10-252-49/+0
| | | | | | | | | | | | Removed the configure test to enable or not the plugin (which solves the problem of the plugin not being built on Windows because of a bug in QMake). Even though it should work on other OpenSL ES implementations than the Android one, it hasn't been tested. Compile and use the plugin only on Android for now. Task-number: QTBUG-34275 Change-Id: I02d47c8be3be8163a17c68b44b8c4b18a218a3fe Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* DirectShow: improve metadata support.Yoann Lopes2013-10-112-0/+54
| | | | | | | | | | Correctly return the list of available metadata. On Windows Vista and later, we now use shell properties to retrieve the metadata. This allows us to get much more metadata properties. Task-number: QTBUG-30776 Change-Id: If542756d08d832903984ef10d09c4caf410bdb1c Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Some cleanup in the GStreamer plugin.Yoann Lopes2013-09-202-61/+0
| | | | | | | | | | | | Removed QGstreamerVideoOverlay and related classes. It was used as 'Window' control but performs worse than QGstreamerVideoWindow which does basically the same thing using GStreamer ready-made components instead. Removed X11 dependencies and related configuration tests. It was only needed for QGstreamerVideoOverlay. Change-Id: I2ad2636ccf0060e56cd64f3d9e5b3c24dc75f5a3 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-121-1/+1
|\ | | | | | | | | | | | | Conflicts: src/plugins/plugins.pro Change-Id: Ieec8b5984b0fba97872bf96c38410369dc0e20cf
| * Change libresourceqt's .pc file.Robin Burchell2013-08-051-1/+1
| | | | | | | | | | | | | | | | The one public port of this library to Qt 5 changed the .pc to libresourceqt5, to avoid clashing with the Qt 4 version. Change-Id: I6a248606e20c4e7a8f432612ca00aded846264d9 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | OpenSL ES audio plugin.Yoann Lopes2013-07-192-0/+49
|/ | | | | | | | Adds support for QAudioOutput, QAudioInput and QAudioDeviceInfo using OpenSL ES 1.0.1. This plugin is used on Android. Change-Id: Idf2c22a861e067196f6c5139e51393b086f64183 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Android: Fix compilation on WindowsEskil Abrahamsen Blomfeldt2013-05-282-10/+0
| | | | | | | | | | | | | | | The qtCompileTest function in configure.prf does not work when cross-compiling on Windows because it detects the wrong make executable. And it's anyway not the best way to do this, since what we really want to check for is the existence of the SDK version, whereas the compile test could potentially hide a lot of other problems under the same error message. Task-number: QTBUG-31405 Change-Id: I2c16b214e40bac5751d4e7098edcc30318756621 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Make directshow-plugin available.Friedemann Kleint2013-05-151-7/+0
| | | | | | | | | | | | | | | No longer include <qedit.h> in directshow-plugin, which no longer ships in newer SDKs. Ensure it only provides the camera service if the WMF-plugin is built by using a different .json-file. Adapt qcamerabackend-test to use widgets. Task-number: QTBUG-28047 Change-Id: I22ea441b9edb56ff55bc275dba37c01c77d8dd90 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Android: Added config tests for multimedia on android.Christian Strømme2013-04-292-0/+10
| | | | | | | | | The Android multimedia plug-in requires API level 11 to compile, so the config test will check and issue a message about the requirement if the API level can't be satisfied. Change-Id: I6c21fe1255024e853023bd8168dfa917b00c4c23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1015-15/+15
| | | | | | Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.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>
* Added config test for AVFoundation frameworkAndy Nichols2012-10-092-0/+50
| | | | | Change-Id: Ifd152513074e6b7802a3ed6d4722ba78762ec79c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2414-350/+350
| | | | | | | | | 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>
* Updated the camerabin2 based camera with QtMultimedia changesDmytro Poplavskiy2012-07-162-0/+62
| | | | | | | | | | | | | | Moved it to the separate plugin as the rest of gstreamer based services; Updated with libqgsttools_p changes; Implemented QMediaRecorder::status property; Made gst_photography dependency optional, it's not always available on desktop; Added video recording case to auto integration test; Moved backend implementation into qt namespace Task-number: QTBUG-26046 Change-Id: Iacfc1a6e263a4c0201d5eb28d04c960b87a230c0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix header path for audio engine on Mac.Michael Goddard2012-06-272-5/+8
| | | | | | | There's a different prefix here. Change-Id: Ifda82e19824801b1d903ab6ad40c97428fff236c Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-253-9/+0
| | | | | | | | | | | | | | | | | - 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>
* switch to new-style configure testsOswald Buddenhagen2012-06-2511-23/+0
| | | | | Change-Id: Ib56d0cb24065c1f990aee5d7f41bfedfe75332a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* delete unused fileOswald Buddenhagen2012-05-091-40/+0
| | | | | Change-Id: I15ad0f30859a3133993f0a75ed0d09bb5ef9cdf5 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* clean up qmake-generated projectsOswald Buddenhagen2012-02-2210-40/+0
| | | | | | | | remove assignmets which are defaults or bogus Change-Id: I7130f22a66b294f92b0ed03749895136d0890a64 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add AudioEngine with new implementationLing Hu2012-02-062-0/+58
| | | | | Change-Id: I5eebe662ecbce9814ed3e763db56df9be737d11f Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3012-12/+12
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I20e5215108c6ebd5f8474fed5c3665118e4791e6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-2312-12/+12
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: Ie8cd560b6d9a2c6e552b6be1ad8bc96c80a6535c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update year in Nokia copyright headers.Jason McDonald2012-01-128-8/+8
| | | | | | | Update headers from before 2011 that were missed in the previous commit. Change-Id: Ib0fd91a39ffc57117fe01280e34519c3f914fac0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove widgets config test.Michael Goddard2012-01-112-53/+0
| | | | | | | | | 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-062-0/+53
| | | | | | | | | | | | | | | 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>
* Update copyright year in license headers.Jason McDonald2012-01-064-4/+4
| | | | | Change-Id: Ib82c1be5548443ef1f5e97b3d5641a2f55d212af Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix X11 and QPA compilation problemsJonas Rabbe2011-12-132-0/+69
| | | | | | | | | The X11 buffer pool was using outdated APIs, and as the 'qpa' configuration value is being removed, it caused the X11 code to be pulled in, and therefore cause compilation failures. Change-Id: I5fdaed854c6525716fccca44b5fbd0b850880cb9 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix config.testMichael Goddard2011-10-251-1/+1
| | | | | | | | Using "this" in non member function, oops. Change-Id: I7cda3eea755099af2ff2df7b777e3e228e53e325 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Copied ALSA config test into QtMultimedia moduleJonas Rabbe2011-10-142-0/+63
| | | | | | | | | | The config test which still exists in QtBase should be removed at a later date, together with pulseaudio and gstreamer config tests. Change-Id: I4bea45ab69d1bac10814fc60ecf24dbc859b0f20 Reviewed-on: http://codereview.qt-project.org/6643 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Moved general gstreamer helper classes into separate library.Jonas Rabbe2011-10-122-0/+69
| | | | | | | | | | 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>
* Fixed directshow config testGareth Stockwell2011-09-261-0/+6
| | | | | | | | | | | | | | | | | | In some versions of Microsoft Windows SDK v6.0A, the qedit.h header is present, but dxtrans.h (which is #included by qedit.h) is missing. The standard workaround for this issue is already used by plugins/multimedia/directshow/camera/dscamerasession.h; this commit adds the same workaround to the config test. Reviewed-by: Michael Goddard Reviewed-by: Ling Hu (cherry picked from commit e3c07dc9dd6a9f7930ca3c61cfd667d816731ce1) Change-Id: Ia53c4f6b3efc86e2447a39e6d95e7f67d7e46b5d Reviewed-on: http://codereview.qt-project.org/5498 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix config.tests for directshow backend.Ling Hu2011-09-261-0/+1
| | | | | | | | | | | | | directshow camera backend requires header qedit.h(currently removed since Windows SDK v7.0), so if there is only Windows SDK v7.0, directshow backend should be disabled, since the directshow mediaplayer will also be replaced by wmf backend. Change-Id: I0de60fdcb683a57cc0aa3570f769179afc0c581b Reviewed-by:Michael Goddard (cherry picked from commit 68d78008f9d1eb82de673b8f4c8e73bdde2150c2) Reviewed-on: http://codereview.qt-project.org/5494 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix the config.tests for WMF backend.Ling Hu2011-09-261-0/+4
| | | | | | | | | | | | Windows SDK v7.0 is required to compile the WMF backend, so add additional check for MENonFatalError. Change-Id: I3edb86b8132b8022b30c02ea6289f617aadfc683 Reviewed-by: Michael Goddard (cherry picked from commit b738126352e5d914ea366b2725b72e2306b39ee2) Reviewed-on: http://codereview.qt-project.org/5493 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Move resource policy usage to a config test.Michael Goddard2011-09-262-0/+64
| | | | | | | | | MeeGo uses this too. Change-Id: I0b7ec00538289d4a3beea62da08233c0d1eb45a2 Reviewed-on: http://codereview.qt-project.org/5447 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Merge branch 'camera' of git://scm.dev.nokia.troll.no/qt/qtmultimediakitMichael Goddard2011-08-302-1/+4
|\ | | | | | | Change-Id: Iec6f96e3713257d25f7b1e06c6da9c153b23800b
| * Ported gstreamer camera backend from camerabin to camerabin2.Dmytro Poplavskiy2011-08-242-1/+4
| | | | | | | | | | | | | | Change-Id: Ieb08df492e7b9cbfe35e93a056685cfdac6e704e Reviewed-on: http://codereview.qt.nokia.com/2994 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 08:53:47 +0000