aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated submodules.Qt Submodule Update Bot2011-08-308-0/+0
| | | | | | | Change-Id: Id157754304d41f761503d2444c74227ee36ebbb6 Reviewed-on: http://codereview.qt.nokia.com/3824 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-08-292-0/+0
| | | | | | | Change-Id: I14bdd5fea17356a839b36a073e02d22740310d31 Reviewed-on: http://codereview.qt.nokia.com/3679 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Enabled compilation of qtpim by default.Rohan McGovern2011-08-271-2/+0
| | | | | | | Change-Id: I19e8fb731c22f50d27b1ca45e36b9884f33ca1f1 Reviewed-on: http://codereview.qt.nokia.com/3428 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-08-276-0/+0
| | | | | | | Change-Id: If7e435713bffafdfce6766023b2b078a0afc3410 Reviewed-on: http://codereview.qt.nokia.com/3633 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Not add remote for external developersLiang Qi2011-08-261-2/+5
| | | | | | | | | | | Gerrit is still for internal at the time. Task-number: QTBUG-21139 Change-Id: Idc282e4db06246dc173f745e11234647d302edd4 Reviewed-by: Sergio Ahumada Reviewed-on: http://codereview.qt.nokia.com/3669 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-08-266-0/+0
| | | | | | | Change-Id: Id77d2b472fd0d708a31f79d8b35292000309c291 Reviewed-on: http://codereview.qt.nokia.com/3614 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-08-2519-0/+0
| | | | | | | Change-Id: I633e03bab2de28a05c945cfddacff8104b609a9e Reviewed-on: http://codereview.qt.nokia.com/3386 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Prepare init-repository script for moving v8 submoduleKent Hansen2011-08-241-16/+18
| | | | | | | | | | | | | | | | Transitional step needed while v8 is moved from qtdeclarative to qtbase. Before the transition is completely in place, init-repository must be able to cope with both qtbase and qtdeclarative having a v8 submodule. This change causes git submodule init/update to be called for both repositories, even though one of them doesn't have any submodules. But in that case it's a no-op. Change-Id: Ia1af01308c808e62eb85431764edd8c12bdc3325 Reviewed-on: http://codereview.qt.nokia.com/3303 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Added new module, qtconnectivity.Rohan McGovern2011-08-244-0/+11
| | | | | | | | | Not yet enabled by default. Change-Id: I89a8cb8cc6da9aeeba217e3ab3c10459082a21ed Reviewed-on: http://codereview.qt.nokia.com/3447 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Added new module, qtpim.Rohan McGovern2011-08-244-0/+11
| | | | | | | | | Not yet enabled by default. Change-Id: I7db1f9a782442876139306a25847e6f23194f672 Reviewed-on: http://codereview.qt.nokia.com/3427 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Remove obsolete testlib files from .gitignoreJason McDonald2011-08-241-2/+0
| | | | | | | Change-Id: Ica80f49426aeb640f3f79af30930d5c5a944ada8 Reviewed-on: http://codereview.qt.nokia.com/3391 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-08-234-0/+0
| | | | | | | Change-Id: Iaf51a8800d4c61e63185e9e00f14e24ca425d091 Reviewed-on: http://codereview.qt.nokia.com/3278 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-08-206-0/+0
| | | | | | | Change-Id: I96beaeb94169e41cca426b7deeb422d828dafa32 Reviewed-on: http://codereview.qt.nokia.com/3115 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-08-174-0/+0
| | | | | | | Change-Id: If9b4829ad190f4cdf343f38b6a8f420a71cc3d34 Reviewed-on: http://codereview.qt.nokia.com/2988 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Enabled qtfeedback, qtquick3d, qtdocgallery by defaultRohan McGovern2011-08-161-6/+0
| | | | | | | | | | | These modules are working and maintained, so they should be enabled by default. Otherwise problems may go undetected for longer than necessary. Change-Id: Id1c79e4c323a31533bf8a0c593431974048a3106 Reviewed-on: http://codereview.qt.nokia.com/2986 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-08-166-0/+0
| | | | | | | Change-Id: I8b3f083684cb5d551de9c0016fbdd812f25e0274 Reviewed-on: http://codereview.qt.nokia.com/2919 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-08-128-0/+0
| | | | | | | Change-Id: I6a9b333b64929f6deaeca1174d57a2d608d8b0ae Reviewed-on: http://codereview.qt.nokia.com/2873 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-08-114-0/+0
| | | | | | | Change-Id: I5566d5532f181852c66c7d5beb7cf0bffa285843 Reviewed-on: http://codereview.qt.nokia.com/2842 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* init-repository: let `--http' option also work for v8Rohan McGovern2011-08-111-6/+21
| | | | | | | | | | Useful for people behind restrictive firewalls. Task-number: QTBUG-20837 Change-Id: I1c6845ceb3b9ba17a0e36c97838a73ed94aa11f2 Reviewed-on: http://codereview.qt.nokia.com/2831 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Added missing qtscript dependency for qtdocgalleryRohan McGovern2011-08-111-1/+1
| | | | | | | Change-Id: I4ed767710d36fbe1de08c425a6ad3fa43ed99252 Reviewed-on: http://codereview.qt.nokia.com/2832 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-08-115-0/+0
| | | | | | | Change-Id: If74d833e0018657c9b1c722aa79e7a41c06d2548 Reviewed-on: http://codereview.qt.nokia.com/2809 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Added new module `qtdocgallery'Rohan McGovern2011-08-104-0/+11
| | | | | | | Change-Id: I9086b41be63b95144dbbd5e5511099baf4068253 Reviewed-on: http://codereview.qt.nokia.com/2793 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-08-103-0/+0
| | | | | | | Change-Id: Icce8840e6714471e303650319c7da6dd38138c1d Reviewed-on: http://codereview.qt.nokia.com/2792 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-08-095-0/+0
| | | | | | | Change-Id: I08652275b4c8f413618f5a31245b63befb800cb0 Reviewed-on: http://codereview.qt.nokia.com/2729 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-08-076-0/+0
| | | | | | | Change-Id: I04e2a51f39b0c3762943ec81943c37f6ee9abaef Reviewed-on: http://codereview.qt.nokia.com/2668 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-08-056-0/+0
| | | | | | | Change-Id: I187b66aec258d17dcad0afa6fe0bf3c0f0f0af55 Reviewed-on: http://codereview.qt.nokia.com/2542 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-08-038-0/+0
| | | | | | | Change-Id: I6721de9afc86f558ac747fecec35299db3d03a40 Reviewed-on: http://codereview.qt.nokia.com/2489 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove qtdeclarative's dependency on qtscriptRohan McGovern2011-08-021-1/+1
| | | | | | | | | | | Since d410ad364ec0b8877797145c68a4d7c3c98ce1c0 in qtdeclarative, qtscript is no longer required to build qtdeclarative. Remove the dependency. Change-Id: Ia1af0121ed05735c8dbec545b8dda30d3d37aa99 Reviewed-on: http://codereview.qt.nokia.com/2405 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Updated submodules.Qt Submodule Update Bot2011-08-025-0/+0
| | | | | | | Change-Id: Ibd8f2da15a852e65ef0fb223324425964e6ab7a6 Reviewed-on: http://codereview.qt.nokia.com/2425 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-08-018-0/+0
| | | | | | Change-Id: I83184ac282f8f3eb2a41cf24e4db5ea70c45abc2 Reviewed-on: http://codereview.qt.nokia.com/2377 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-07-296-0/+0
| | | | | | | Change-Id: Idbb6eaa9d311db030bb7ea74d8799f7878975c7e Reviewed-on: http://codereview.qt.nokia.com/2319 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-07-286-0/+0
| | | | | | | Change-Id: I251efdef5f99859d541117c05cc01c0c437ccd18 Reviewed-on: http://codereview.qt.nokia.com/2305 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2011-07-2610-0/+0
| | | | | | | Change-Id: Iaf92b943c9c648f5e2e11590deb555c4037879da Reviewed-on: http://codereview.qt.nokia.com/1787 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* QtDoc only depends on QtBaseSergio Ahumada2011-07-261-1/+1
| | | | | | | Change-Id: Idff3e2edf6d94fa99147e3bc2754c7414d7fbdb4 Reviewed-on: http://codereview.qt.nokia.com/2202 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Updated submodules.Rohan McGovern2011-07-2219-0/+0
| | | | | | | | | | | Some modules have been held back due to source compatibility breaks which have not yet received fixes in all dependent modules. Change-Id: Ibc01b70bf9509ccb79ef9cd56022b9a0d080e397 Reviewed-on: http://codereview.qt.nokia.com/2002 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add qtquick3d module.Sarah Smith2011-07-184-9/+39
| | | | | | | | Change-Id: Ib3219c64e0100a4f79023d0a23972590fe3bd9f4 Reviewed-on: http://codereview.qt.nokia.com/1723 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Disable QtMultimedia, since QtMultimediaKit has replaced it.Michael Goddard2011-07-181-0/+2
| | | | | | | Change-Id: I41f543d9faa42e3951e6d5f0eb29dd1b867427ca Reviewed-on: http://codereview.qt.nokia.com/1682 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Allow initial checkout of V8 with the Brisbane mirrorAlan Alpert2011-07-121-0/+20
| | | | | | | | Change-Id: Iaaaa88884e0a793218e2e307bd9e56067760c514 Reviewed-on: http://codereview.qt.nokia.com/1393 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Update licenseheader text in source files for qt5 repoJyri Tahtela2011-07-082-35/+35
| | | | | | | | | Replace old license header with correct one. Change-Id: I85f5a152069bdd1433f41f41e766063ec0fdbe13 Reviewed-on: http://codereview.qt.nokia.com/1371 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* qtwebkit: work around compile failure in npapi when using qpaRohan McGovern2011-07-081-0/+4
| | | | | | | | | | | | The current version of qtwebkit used in qt5 does not work with Qt/QPA. The problem is in the netscape plugin API's usage of QX11EmbedContainer. Disable the netscape plugin API until qtwebkit in qt5 can be updated to a fixed version. Change-Id: I833bfff2f1b1059810206b4160494eb59734b5ea Reviewed-on: http://codereview.qt.nokia.com/1337 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Can now tell init-repository to only use a subset of modulesAlan Alpert2011-07-072-19/+54
| | | | | | | | | | | | | | Still useful to use init-repository because of all the other logic, such as repository urls. More general than --no-webkit, although it is still a valid convenience as the most common case. Also makes qt.pro check for existence of modules, since it is no longer certain that you'll have everything but webkit. Change-Id: Iaaaa30e24e0a793218e2e307bdde56067760c513 Reviewed-on: http://codereview.qt.nokia.com/1258 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* init-repository: replace obsolete staging remotes with gerrit remotesRohan McGovern2011-07-071-54/+42
| | | | | | | | | | All Qt5 modules are now moved into gerrit. The staging repositories are obsolete. Change-Id: Ibdde6234da97a4664e54dbcd4425ed1b022cf850 Reviewed-on: http://codereview.qt.nokia.com/1254 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Enable building of Qt Multimedia Kit by default.Jonas Rabbe2011-07-071-2/+0
| | | | | | | Change-Id: I9a74a43c71371fcb95f8b24c007ff95907a270a4 Reviewed-on: http://codereview.qt.nokia.com/1255 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-stagingQt Continuous Integration System2011-07-0610-0/+0
|\ | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging: Updated submodules.
| * Updated submodules.Qt Submodule Update Automaton2011-07-0610-0/+0
| | | | | | | | Change-Id: I8c39bb8a8961abf287ed3efaafce763b910bbae2
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-stagingQt Continuous Integration System2011-07-051-18/+97
|\| | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging: README: improve build instructions
| * README: improve build instructionsRohan McGovern2011-07-051-18/+97
| | | | | | | | | | | | | | Explain the stable build process first, followed by the bleeding-edge build process. Previously, the README exclusively recommended only the process for building bleeding-edge of all modules together, which frequently results in build failures.
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-stagingQt Continuous Integration System2011-07-044-0/+11
|\| | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging: Added qtfeedback module.
| * Added qtfeedback module.Rohan McGovern2011-07-044-0/+11
| | | | | | | | Not yet compiled by default.
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-stagingQt Continuous Integration System2011-07-0218-2/+5
|\| | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging: Update qttools (fix compile) qtwebkit: force separate_debug_info off Update qtwebkit (fix compile) Update submodule reference to the latest. Update the head for qtsystems submodule. Enable the build for QtSystems by default.