summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Yoann Lopes2014-01-304-8/+2
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-274-8/+2
| |\ | | | | | | | | | Change-Id: I83d589c55e8463cce23068dc81096aa66ec596a5
| | * Allow plugins to override the QML VideoOutput type.Andrew den Exter2014-01-204-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | whitespace fixesOswald Buddenhagen2014-01-308-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | remove trailing spaces & expand tabs. Change-Id: I05ef110abed90f13b47752760ffb4567a11a6a5e Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* | | Fix MSVC-warning about truncation of constant in tst_qaudiobuffer.cpp.Friedemann Kleint2014-01-291-1/+1
| | | | | | | | | | | | | | | Change-Id: If9e239be38f8d15542ab9bf3a74bccf0a43b4e69 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | Fix MSVC-warnings about unsafe bool operations in tst_qcamera.cpp.Friedemann Kleint2014-01-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | qglobal.h(501) : warning C4804: '-' : unsafe use of type 'bool' in operation global/qglobal.h(501) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning) tst_qcamera.cpp(507) : see reference to function template instantiation 'T qAbs<bool>(const T &)' being compiled Change-Id: Ifd467b5536a0d386f592ae339129b3ebfb7b8838 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | Fix MSVC-warnings about unused variable meta in tst_qdeclarativevideooutput.cpp.Friedemann Kleint2014-01-291-4/+2
|/ / | | | | | | | | Change-Id: If324fd2e65acb7650b1d8dee4964a2c2bb17f876 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-174-8/+17
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id367a610a3aefd288bfe287a3bf64606e582deb9
| * Fix build without Qml and Quick modules.Yoann Lopes2014-01-164-8/+17
| | | | | | | | | | | | | | | | | | Conditionally enable auto-tests that depend on the Quick and Qml modules. Task-number: QTBUG-35911 Change-Id: I8b9d304ea630093d423b48a4ebc53ef6f4280244 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-101-0/+2
|\| | | | | | | Change-Id: I7dc36a224702721b67ffa2cf7f9ce2a6b047f88e
| * Mark tst_qcamerabackend test as insignificant on Mac OS XSimon Hausmann2014-01-081-0/+2
| | | | | | | | | | | | | | | | | | It has failed 6 times during qt5.git stable integrations since September 2013 See also QTBUG-36040 Change-Id: I6abd5b2723d2346a4831ab28fa040c14615148b0 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Fix whitespace issue in the QVideoFrame auto test.Christian Strømme2014-01-071-1/+1
|/ | | | | | | | The test was failing because it was expecting a trailing whitespace directly after the serialization of the meta-data map. Change-Id: I62aa022492c721d408d23a98e8a3cfa173f45e68 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Remove unnecessary warning in QMediaPlaylistNavigator.Yoann Lopes2013-10-092-4/+1
| | | | | | Task-number: QTBUG-33862 Change-Id: Ie74e649ebb5819ccf6300492bdce2a0046b87f02 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* CoreAudio: Create an audio plugin supporting iOS and OS XAndy Nichols2013-09-191-2/+3
| | | | | | | | | | This removes the Mac audio backend that was hardcoded into QtMultimedia and adds a new audio plugin using the CoreAudio API. Change-Id: Ib15291825f9452a3763e0eeb281d952deb0bad3d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Stabilized QPainterVideoSurface auto-test.Yoann Lopes2013-09-171-0/+12
| | | | | Change-Id: Idfd6f8396dce223be1c73ad56c6f7f66ca9d5d25 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Multimedia plugins now have a unique JSON metadata 'Keys' property.Yoann Lopes2013-06-214-4/+8
| | | | | | | | | | | | | | | | | | | | | They previously had the multimedia services they provided as keys. This was a problem when several plugins were available on the same platform, providing the same multimedia service, but with different features or capabilities. Since they had the same key, only the first plugin in the directory was loaded. Nevertheless, it was actually working until commit 732dcfe7 in qtbase, as all plugins were loaded even when sharing the same key. The services a multimedia plugin provides are now declared in the 'Services' property. To preserve compatibility with third-party plugins, if that new property doesn't exist it falls back to the 'Keys' property. Task-number: QTBUG-31868 Task-number: QTBUG-31476 Change-Id: Ic3ba32eeef21b69b922bd3d4feb111101559d132 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Make directshow-plugin available.Friedemann Kleint2013-05-152-1/+3
| | | | | | | | | | | | | | | 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>
* Decouple qmediametadata.h from qmultimedia.hSze Howe Koh2013-05-146-0/+6
| | | | | | | | 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>
* Fix bic autotestJan Arve Saether2013-04-294-112/+12
| | | | | | | | | | | | Caused by https://codereview.qt-project.org/54820 I actually tried to avoid this with https://codereview.qt-project.org/54837 but my assumption was wrong. Change-Id: If0db8c9b5a317e07d97bcf97056b44e2124d1e1b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fix hang in tst_qaudioinput (Windows).Friedemann Kleint2013-04-161-2/+2
| | | | | | | Task-number: QTBUG-28731 Change-Id: Iebe598f9e0760b05d05d5a6b6ecbeb535e745e2c Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Fix calculation bug in QWaveDecoder.Christian Strømme2013-03-222-0/+2
| | | | | | | | | When comparing the size of the WaveHeader and the chunk size, we need to include the ID and Size fields, or any extra data won't be discarded and the parsing will fail. Change-Id: I730833f33f57b26cd750985354136191f7e7ce04 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Stabilizes QAudioInput auto-test.Yoann Lopes2013-03-221-2/+2
| | | | | Change-Id: I85c7a38559e023f89271c0836730f6cec8f429cb Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Merge branch 'dev' into stableSergio Ahumada2013-03-196-714/+0
|\ | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: I0f78796735fc37e092b6747bdc89cc0f41164472
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-142-2/+2
| |\ | | | | | | | | | Change-Id: Ifee8e5713e95d516081c4bc911e8f0bb6a169b13
| * | Remove qaccessible2 bic data.Frederik Gladhorn2013-03-134-704/+0
| | | | | | | | | | | | | | | Change-Id: I2c83f05c18753f5c692ec0c6f7701faec9f04416 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-19118-114/+60276
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Remove QEXPECT_FAIL on Linux for QPainterVideoSurface::shaderPresentAndy Nichols2013-02-191-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests seem to be passing consistently now, so this is an attempt to reenable them on Linux, as right now passing them on some Linux machines in CI is causing failures. Task-number: QTBUG-26320 Change-Id: I4f2b219dc694e24d8beee651919f3b805922bde1 Reviewed-by: Tobias Koenig Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-281-4/+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>
* | | | Test the cmake multimediawidgets module only if widgets is available.Stephen Kelly2013-03-141-2/+11
| |_|/ |/| | | | | | | | | | | | | | Change-Id: I381e1b0883fb4fdc68627848ee39a26ce22e2ba5 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | Use qmake for package dependency resolution in cmake tests.Stephen Kelly2013-02-262-2/+2
| |/ |/| | | | | | | | | | | This allows us to remove hardcoded depends information. Change-Id: If8f3b8e9e75db3b0b78864626314ebebb96c548f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Fix XPASS on Ubuntu Precise Pangolin.Friedemann Kleint2013-02-182-1/+3
| | | | | | | | | | | | Change-Id: I0199ad3a52621763c214fa65302d3de4701814cf Reviewed-by: Tobias Koenig Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | Remove QPointerBase bic check.Stephen Kelly2013-02-134-20/+0
| | | | | | | | | | | | | | QPointerBase is not public or exported and it is to be removed Change-Id: Ifd43a34125af1116b130321df6256b2a7a9b05a2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | tst_bic: Replace test data for linux-gcc-ia32Sergio Ahumada2013-01-314-4079/+34187
| | | | | | | | | | | | | | | | | | | | The ia32 bic data was re-generated due to a BIC introduced by a45d35c07f9eed27fc286ab5fbc00789d45259b5 While we are at it, add a new set of data for amd64. Change-Id: Id210b57f68229aaca09c0cd81bd371392d2bcc74 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | tst_bic: Add linux-gcc-ia32 bic data for QtMultimediaWidgetsSergio Ahumada2013-01-152-1/+20492
| | | | | | | | | | Change-Id: I070b233b3358abd16bda8e83c139b7ad61b6fdd0 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | make use of qtHaveModule()Oswald Buddenhagen2013-01-112-4/+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>
* | tst_bic: Add test data for linux-gcc-ia32Sergio Ahumada2013-01-113-0/+9583
| | | | | | | | | | | | Task-number: QTQAINFRA-321 Change-Id: I51cabb707107ae6cc788ff04b0886dc3d06b3693 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Update copyright year in Digia's license headersSergio Ahumada2013-01-10110-110/+110
|/ | | | | | Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-1643-43/+1
| | | | | | | | 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>
* test: Mark tst_QPainterVideoSurface as insignificant on WindowsSergio Ahumada2012-12-111-0/+2
| | | | | | Task-number: QTBUG-28542 Change-Id: Ib879ffd31e534cc9cde4c4893af6f2a7799529cd Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* test: Mark tst_QDeclarativeVideoOutputWindow as insignificant on WindowsSergio Ahumada2012-12-111-0/+2
| | | | | | Task-number: QTBUG-28541 Change-Id: I5d59a1daf5494aca28a573e312bbf1bf8e7d95e2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add PLUGIN_CLASS_NAME to qtmultimedia pluginsMiikka Heikkinen2012-12-104-0/+4
| | | | | | | | Needed for automating static plugin loading. Task-number: QTBUG-28131 Change-Id: Ia392b112fc46dedd34c9ffdbd6e874dbbfeaef83 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove pointless QT.<module>.sources referencesOswald Buddenhagen2012-12-044-15/+15
| | | | | | | | there is no point to use this for in-module references. cleaning it out in an attempt to purge the constants entirely. Change-Id: Id160b6241126717dc412d80aeaa13df3cbf8fa17 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix syncqt-warnings.Friedemann Kleint2012-11-191-1/+1
| | | | | | | Use include with module name for the multimedia-classes. Change-Id: I8da1a4015a162959b604cd859aee139e246e3f6c Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Rename namespace QtMultimedia -> QMultimediaSze Howe Koh2012-11-0617-171/+171
| | | | | | | | | | | | | | | | 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-067-32/+32
| | | | | | | | | | | | | | | | | | 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>
* adjust to qt_plugin.prf changesOswald Buddenhagen2012-11-054-16/+16
| | | | | | | | | | DESTDIR and INSTALLS+=target are set up automatically now. note that in the qmediaserviceprovider test we must override that. also, TARGET munging is done automatically. Change-Id: Ida5d5601e22b099134d1ec07ace713e0d0986bd6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* test: Mark tst_QSoundEffect as insignificantSergio Ahumada2012-11-011-1/+2
| | | | | | | Task-number: QTBUG-26509 Task-number: QTBUG-26748 Change-Id: Id8952c2ed3e2a261907eed1e160fc187af6983ce Reviewed-by: Rohan McGovern <rohan@mcgovern.id.au>
* CMake: Remove obsolete test_modules testStephen Kelly2012-11-013-82/+0
| | | | | | | The generated module_includes test is a super-set of this test. Change-Id: I33d665a38d664c049028519d73dfad912fc22a1f Reviewed-by: Rohan McGovern [inactive] <rohan.mcgovern@nokia.com>
* CMake: Test module includesStephen Kelly2012-10-311-0/+7
| | | | | Change-Id: I1676efff8071fa0fae13bb484a5e18928e35f663 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove stale QT_MODULE() usage casesSergio Ahumada2012-10-251-2/+0
| | | | | | | As of Qt5, this macro is defined to be empty; simply get rid of these leftovers. Change-Id: Id24056c0afd013904b1e098dc49e502038fd77a4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 12:17:23 +0000