aboutsummaryrefslogtreecommitdiffstats
path: root/qt.pro
Commit message (Collapse)AuthorAgeFilesLines
* Added new gitmodule `qt3d'Rohan McGovern2011-12-191-1/+8
| | | | | | | | | To replace qtquick3d. This commit introduces qt3d, a follow-up commit will remove qtquick3d. Change-Id: I3d1b46e7e1e32960351f02ec22a6e555203f988a Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Remove spurious dep on qtscriptSarah Smith2011-12-061-1/+1
| | | | | | | | | | At one time qtscript was required, but no longer. In any case it builds fine without. Change-Id: I43a3862673a4db4ef7145056101b2c7639dd2c3f Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Laing <david.laing@nokia.com>
* QtJsonDb doesn't depend on QtSvg.Xizhi Zhu2011-11-171-1/+1
| | | | | | | Change-Id: I2491bc7401070763083a5f36c49ede1525626601 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* Added new module, qtjsondb.Sergio Ahumada2011-10-311-0/+7
| | | | | | | | | Not yet enabled by default. Change-Id: I07093f8770a7b2f05aa777cbf949a30478dacc67 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* Remove QtMultimediaKit - all content has moved to QtMultimedia.Michael Goddard2011-10-271-8/+1
| | | | | | Change-Id: I54741996cb3dbfbb76dd0f864e4e72cd8b6bbd67 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Re-add qtmultimedia.Michael Goddard2011-10-261-0/+7
| | | | | | | | | | The contents of QtMultimediaKit are being placed in QtMultimedia. After this commit integrates, any dependent modules can be updated, and then another change to remove QtMMK from Qt5 can be done. Change-Id: I466df08ef1e764fae9056a61a51b82cab8633244 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QtDeclarative no longer depends on QtSvgAlan Alpert2011-10-101-1/+1
| | | | | | | Change-Id: Iaaaa634beef234d9b4d0bed56c4d4cab9459fbaa Reviewed-on: http://codereview.qt-project.org/6280 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Revert "Enabled compilation of qtwayland by default."Rohan McGovern2011-09-281-0/+2
| | | | | | | | | | | | | This reverts commit a507ff6241d8d22d4405a445fdbd16f32f1e3cde This commit is counterproductive at least until qtwayland follows a few more modularization requirements (e.g. .pro file named `qtwayland.pro') Change-Id: I5b9e6283eef9aaf1cdc3b71823181eaab1f9f3a7 Reviewed-on: http://codereview.qt-project.org/5681 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Enabled compilation of qtwayland by default.Rohan McGovern2011-09-271-2/+0
| | | | | | | | Change-Id: I8c62231ddbee1a731db7aa98a0796c8e81ee5a44 Reviewed-on: http://codereview.qt-project.org/5581 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Added new module, qtwayland.Rohan McGovern2011-09-271-0/+7
| | | | | | | | | | Not yet enabled by default. Change-Id: I6f22e7d69743415ec8f9588a8621cd28ca6d8eda Reviewed-on: http://codereview.qt-project.org/5580 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Re-enable qtlocation by default.Rohan McGovern2011-09-231-2/+0
| | | | | | | Change-Id: Ib4e96ebc014d5f8651ab16184955645fbba16458 Reviewed-on: http://codereview.qt-project.org/5355 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Enabled qtconnectivity by default.Rohan McGovern2011-09-231-2/+0
| | | | | | | Change-Id: Ic34b6d270cdb754167977e9bda4c41a23819f31a Reviewed-on: http://codereview.qt-project.org/5415 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules (merged refactor)Rohan McGovern2011-09-221-2/+4
| | | | | | | | | | | | | This commit updates all applicable submodules past the merge of the refactor branches. Dependencies for qtlocation and qtdoc in qt.pro were fixed to match the latest dependencies in those modules. Change-Id: I0000000000000d80ddaf92f258714ab4a2750cb7 Reviewed-on: http://codereview.qt-project.org/5109 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove QtMultimedia (obsoleted by QtMultimediaKit).Michael Goddard2011-09-021-7/+0
| | | | | | | | | Change-Id: I6fbdde1d28f3156aee0bf9caaae7a1e3b3a4392a Reviewed-on: http://codereview.qt.nokia.com/4105 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added missing dependency for qtfeedback.Rohan McGovern2011-08-311-1/+1
| | | | | | | | | | qtfeedback uses qtmultimediakit (in src/plugins/feedback/mmk), but qt.pro was missing the dependency. Change-Id: I1f54cc31cc9ac8bab2583f5afe4f9d7a13545844 Reviewed-on: http://codereview.qt.nokia.com/3900 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@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>
* Added new module, qtconnectivity.Rohan McGovern2011-08-241-0/+7
| | | | | | | | | 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-241-0/+7
| | | | | | | | | 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>
* 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>
* 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>
* Added new module `qtdocgallery'Rohan McGovern2011-08-101-0/+7
| | | | | | | 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>
* 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>
* 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>
* Add qtquick3d module.Sarah Smith2011-07-181-0/+7
| | | | | | | | 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>
* Can now tell init-repository to only use a subset of modulesAlan Alpert2011-07-071-19/+23
| | | | | | | | | | | | | | 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>
* 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>
* Added qtfeedback module.Rohan McGovern2011-07-041-0/+7
| | | | Not yet compiled by default.
* Enable the build for QtSystems by default.Xizhi Zhu2011-06-291-2/+0
|
* Add the QtMultimediaKit module. Currently not built.Michael Goddard2011-06-291-0/+7
| | | | Reviewed-by: Rohan McGovern
* Add the QtSystems module.Xizhi Zhu2011-06-231-0/+7
|
* Enable Sensors and Location API builds by defaultAlex2011-06-061-4/+0
|
* Add new QtSensors moduleAlex2011-05-201-0/+7
|
* Correct missing module_activeqt -> module_qtactiveqtMarius Storm-Olsen2011-05-191-1/+1
|
* Clean up inconsistent usage of `depends' in qt.proRohan McGovern2011-05-191-3/+3
| | | | | | Some of the depends were referring to qmake targets and some of them were referring to make targets. That's unnecessarily confusing. Make them consistent.
* The qtlocation module depends on declarative tooAlex2011-05-171-1/+1
|
* Remove platform-specific logic for qtactiveqt module.Rohan McGovern2011-05-131-1/+1
| | | | | | | | | | | | For the sake of a uniform test procedure, it is cleaner to have `make module-qtactiveqt' always working, but simply not building anything on platforms where ActiveQt is not supported. Without this, any test procedure for building Qt5 needs to be able to know or determine that ActiveQt should only be built on Windows. Reviewed-by: Jason McDonald Change-Id: I3869bbacdc6598a764561a4b9f6042c49e6ffae8
* qtlocation: add to SUBDIRS, but do not (yet) compile it by defaultRohan McGovern2011-05-111-1/+3
| | | | | | | | The previous method of adding qtlocation did not allow `make module-qtlocation' to work. Reviewed-by: Alex Change-Id: I75caab75ddf8ed5800c75933097df297b0021c6c
* Add new qtlocation moduleAlex2011-05-101-0/+5
| | | | | The module is not yet enabled as various other repos need to be in place first.
* Corrected typo.axis2011-05-051-1/+1
| | | | Reviewed-by: Trust me
* Removed qt3support.axis2011-05-051-6/+1
| | | | | | It will not be part of Qt5. Reviewed-by: Marius Storm-Olsen
* build system: use consistent target names for all modulesRohan McGovern2011-05-051-12/+21
| | | | | | | | | | | Force all top-level makefile rules to be named `module-$GITSUBMODULE', including the addition of the missing qlalr and qtqa targets. This naming convention must be upheld, otherwise there is no simple way to programmatically build a single git submodule and all of its dependencies. Reviewed-by: Liang Qi
* Avoided running the build-webkit script if it has not been cloned.axis2011-04-281-3/+6
| | | | Reviewed by: Olivier Goffart
* Long live the qt5 Qt repositoryQt by Nokia2011-04-271-0/+80
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 03:56:38 +0000