summaryrefslogtreecommitdiffstats
path: root/sync.profile
Commit message (Collapse)AuthorAgeFilesLines
* Remove unnecessary dependency to qtjsbackend from sync.profileSimon Hausmann2013-08-161-1/+0
| | | | | Change-Id: Ie72932d3a9ba1bfa2f282e8134b50b2d6b8ec469 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* sync.profile: Point dependencies to an empty stringSergio Ahumada2013-05-261-4/+5
| | | | | | | | | | | This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: I8f899a9a9fb9e94b99a9250eb5eb2dbe2eed8fc5 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* sync.profile: Point dependencies to 'refs/heads/stable'v5.0.0-rc1Sergio Ahumada2012-12-041-4/+4
| | | | | | | | | | | We should test stable branches against stable branches only. At some point we should automate the merges from dev->stable->release and decide how to handle possible merge conflicts. This is good enough for the time being. Change-Id: I87e02c9d323b524898d93fb5d1d4387218a984c5 Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Enable the "#include <QAudio>" camel-case header (regression)Sze Howe Koh2012-11-061-0/+1
| | | | | | | | The header was available in Qt 4, but somehow went missing. Change-Id: I5e54921afd6e196d67db797331a0b0093f41ce34 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Enable the "#include <QMultimedia>" camel-case headerSze Howe Koh2012-11-061-1/+2
| | | | | | | | | | | | Rename qtmedianamespace.h/cpp -> qmultimedia.h/cpp, and have sync.profile generate the camel-case header during compilation. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: Iade9ee6538970b4b9935f169eb2d9a0ea6949a95 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Enable the "#include <QMediaMetaData>" camel-case headerSze Howe Koh2012-11-061-0/+4
| | | | | | | | | | | | | | | | | | Move the QMediaMetaData namespace into new files, and have sync.profile generate the camel-case header during compilation. For now, the new header (qmediametadata.h) is included whereever the old one appears (qtmedianamespace.h), but an audit will be done later to make explicit #includes only where necessary. NOTE: Git may think that a rename has occurred. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I63705722a5e175628d56128888a94ae4c20879f2 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix missing internal module in sync.profileAndy Nichols2012-09-241-0/+1
| | | | | | | | | Build was broken for shadow builds because qtmultimediaquicktools was not listed in sync.profile Change-Id: If9d23906dbd37b651a545ae810ee9883b6a23348 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* build system cleanupsOswald Buddenhagen2012-06-251-11/+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-251-20/+0
| | | | | Change-Id: Ib56d0cb24065c1f990aee5d7f41bfedfe75332a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-251-5/+0
| | | | | Change-Id: I19285dfef7294e813ec241a8f6f00a804d56df49 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove pin of qtbase for qtmultimedia.Sergio Ahumada2012-03-051-1/+1
| | | | | Change-Id: I2e57bab345b90943613466b4bc655af1d5a5b831 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Pin QtBase SHA1 until it's fixed.Michael Goddard2012-03-021-2/+1
| | | | | | | | Also remove QtSvg dependency that came from QtDeclarative a long time ago. Change-Id: Iac851e027a6a6f61896fecd36b43a4036dd1b717 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add AudioEngine with new implementationLing Hu2012-02-061-0/+2
| | | | | Change-Id: I5eebe662ecbce9814ed3e763db56df9be737d11f Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove widgets config test.Michael Goddard2012-01-111-3/+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>
* sync.profile: introduce dependency on qtjsbackendRohan McGovern2012-01-101-0/+1
| | | | | | | | | sync.profile needs to enumerate indirect dependencies too. qtdeclarative now depends on qtjsbackend; update sync.profile accordingly. Change-Id: I45cd8d2ca7e35abbb58b83f133e33a052aa4598e Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Properly handle the case where QtWidgets is not available.Michael Goddard2012-01-061-0/+3
| | | | | | | | | | | | | | | 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>
* Fix X11 and QPA compilation problemsJonas Rabbe2011-12-131-0/+1
| | | | | | | | | 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>
* Copied ALSA config test into QtMultimedia moduleJonas Rabbe2011-10-141-0/+1
| | | | | | | | | | 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-121-0/+1
| | | | | | | | | | 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-7/+6
| | | | | | | | | | 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>
* Move resource policy usage to a config test.Michael Goddard2011-09-261-0/+1
| | | | | | | | | 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>
* Try to move widget/gvitem code into new QtMultimediaKitWidgets lib.Michael Goddard2011-08-251-0/+3
| | | | | | | 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>
* Add Windows Media Foundation backend for QMediaPlayerMichael Goddard2011-07-251-0/+1
| | | | | | | | | | | | Task-number:QTMOBILITY-1606 Reviewed-by: Michael Goddard (cherry picked from commit bdf3a9b39661cfb836245139d02e95e854646a7e) (cherry picked from commit 8d2370953eb32bf44a037244e0d9f9b484875f7a) Change-Id: I07790b8c540a04e4e19a3d018a4884a773e980bf Reviewed-on: http://codereview.qt.nokia.com/2086 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Add the configuration tests.Michael Goddard2011-07-251-0/+13
| | | | | | | | | | Add the list of tests to sync.profile, and make sure each test only happens on the platforms it's intended for. Change-Id: Id022a6b85b349f4a8a649d3449b622e4ada7f4f4 Reviewed-on: http://codereview.qt.nokia.com/1910 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Update sync.profile dependencies to new syntaxAlan Alpert2011-07-081-10/+9
| | | | | | | | | | %dependencies now has a simpler format of gitmodule => %gitref instead of using qt modules and keywords. Change-Id: I785f30e24e0a793218e2e307bdde56067760c51c Reviewed-on: http://codereview.qt.nokia.com/1281 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Initial copy of QtMultimediaKit.Michael Goddard2011-06-291-0/+35
Comes from original repo, with SHA1: 2c82d5611655e5967f5c5095af50c0991c4378b2