summaryrefslogtreecommitdiffstats
path: root/qt.pro
Commit message (Collapse)AuthorAgeFilesLines
* Remove submodules which are not part of Qt 5.0.Stephen Kelly2012-10-301-72/+1
| | | | | | | | Task-number: QTBUG-27736 Change-Id: I737515d2cfe687448a03b67ce9f2c14d108f2a1d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Tweak name of Makefile for QtWebKit to just 'Makefile', not 'Makefile.WebKit'Tor Arne Vestbø2012-10-191-0/+1
| | | | | Change-Id: I8399f640d5e5f14b4453a97b543db602859d6278 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Introduce dependency: QtQuick1 needs QtWebKitSimon Hausmann2012-09-261-0/+1
| | | | | | | | | | | | The QML1 WebKit integration is moved to the QtQuick1 module, so this dependency needs to be expressed in qt.pro. It is technically an optional dependency, because the module can be built without, but if WebKit is available then it should be built before QtQuick1. Change-Id: Iae69339827afe6449a7af8fd6ae7de62632f30ed Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* WebKit updateSimon Hausmann2012-09-211-4/+9
| | | | | | | | | | | | This should fix the build errors that "looked" like errors from Qt3D but were triggered through an incorrect QtWebKit module master header file, as well as the supposed linking errors related to WebKit2. Also disable the WebKit build if ICU is not available instead of breaking the build when reaching WebKit. Change-Id: I109b4152c081250c8950ef62dd7278129b716f76 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Update WebKitSimon Hausmann2012-09-141-7/+2
| | | | | | | | | This updates WebKit to the latest snapshot that enables the build of WebKit2 on Windows and also drastically simplifies the build of WebKit within Qt to be built the same way as the other modules, i.e. using qmake && make Change-Id: I6e82e75ae0c3b62aff879f4339fcdce39e7f6954 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
* Cut some build dependenciesCorentin Jabot2012-09-081-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | A lot of modules had a hard depency on qtdeclarative (for extra qml components or qml examples). Now, these modules can be build without the need of qtdeclarative. These modules are: qttools (since 3b9ac2dc08310aa13b121274afea130fa4f7c6f8 ) qtmultimedia (since 02f144ba6f50bb7d404e2808b9bb4fa32a206aea ) qtsystems (since 12408d021af8b9f8e0afad7ae67f389974ed0607 ) qtlocation (since fa404bfb7a83ecb01deb4df16d5ac72a8c5ab066 ) qtsensors ( since 3c069e5e4a720582f37f0b2d053d19632f6ddfe2 ) Also, useless dependencies are cut, and the dependencies declared in build.dependencis mirror more accurately what is done is qt.pro Those modifications allow an easier and faster build for people who do not use qml. Note that qtdelarative will still be needed to build the tests of each of the modules listed above Change-Id: Icf7711c07d041b8ef836f213fadeebb9328877d5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove qtjsondb from qt5.gitLars Knoll2012-08-281-11/+0
| | | | | | | | | | | | | | The jsondb module has been ongoing research work. But it won't be done in time for Qt 5.0, and is currently also less relevant. It's also currently not being actively worked on. So let's remove it from the list of modules compiled with qt5.git and keep it as research. The module can still be compiled stand-alone on top of the Qt essentials. Change-Id: I6fd4524cae43b803a842788ff22a7525dc7bc0e6 Reviewed-by: Yuchen Deng <loaden@gmail.com> Reviewed-by: Kevin Simons <kevin.b.simons@gmail.com>
* Remove docgallery from qt5.gitLars Knoll2012-08-061-6/+0
| | | | | | | | | | | | The document gallery has been pretty much unmaintained for a year now and the only backends we have are for tracker (ie. the N9), the deprecated jsondb client API and the simulator. it doesn't work anywhere else currently. Change-Id: I5c12e23be7ed8862e891e996fbd6191e79f4fdef Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Remove phonon as discussed on the mailing listLars Knoll2012-07-301-5/+0
| | | | | | | | | | phonon's upstream is in KDE's repositories and the port to Qt 5 on qt-project is not maintained. So it's only logical to remove it. KDE frameworks 5 will hopefully provide a phonon module for Qt 5 again in the future. Change-Id: I30189d921913868f2253841648ba57b2aaf3650c Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Add soft dependency on Qt Multimedia to Qt Location.Aaron McCarthy2012-07-111-0/+2
| | | | | | | | | The Qt Location mapviewer example makes use of Qt Multimedia. Task-number: QTBUG-26468 Change-Id: Ifa6e71ef582e32866567ca318903e2359248a3d0 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Enabled installation of QtGraphicalEffects add-on module.Marko Niemelä2012-06-291-2/+0
| | | | | | | | | | | | Default installation has been disabled during alpha/beta phase of qt5, but there should not be any reasons that prevents it to be installed along other essential and add-on modules. Change-Id: I9cca7526a773f470fe697de918485328befc6100 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* create top-level .qmake.super instead of .qmake.cacheOswald Buddenhagen2012-06-291-0/+3
| | | | | | | | | | at this point, the cache is needed only to aggregate the modules, not to "export" qtbase internals. the modules now have private caches for "real" config data. Change-Id: I4c70d220bbc054023710680545a04c171e238aff Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* webkit-examples depends on qttools (uitools)Oswald Buddenhagen2012-06-291-6/+7
| | | | | Change-Id: I4e94785003feedd7db904eec659bb5794a7b433b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* remove stale workaround for circular dependencyOswald Buddenhagen2012-06-291-2/+1
| | | | | | | webkit does not depend on quick1 anymore Change-Id: I6e813dd773e37c4fed66a8ff096c77365c64fcb2 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* fix SUBDIRS sorting according to dependencies againOswald Buddenhagen2012-06-291-1/+1
| | | | | | | quick1 depends on tools now Change-Id: I1575c03af2e6af1244f75d3c9e72481536d1a913 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update WebKitSimon Hausmann2012-06-191-3/+11
| | | | | | | | This removes the QtScript dependency and prepares for a future build flag to ensure -Werror remains disabled. Change-Id: I95cf773c1e21d08d3afe881458c352398e3c9e84 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix dependencies between quick1 and toolsLars Knoll2012-06-131-3/+3
| | | | | Change-Id: I80ace901a2fc57f72ce9bb1d20cfa90f3faa1870 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* qtquick1 now depends on qttools, not the other way roundLars Knoll2012-06-081-3/+7
| | | | | | | | This depends on https://codereview.qt-project.org/#change,28044 and https://codereview.qt-project.org/#change,28047 Change-Id: I1587b0c4b8f3d3b25acf6106aedf0824270da98d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove doc gallery dependency onto QtScriptLars Knoll2012-06-071-1/+1
| | | | | Change-Id: Ide27d6e19a386ce1af5ee4b44b3366aaa430546c Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* qt.pro: update modules dependency on qtxmlpatternsTasuku Suzuki2012-06-021-5/+11
| | | | | | | | | remove the dependency from qtjsondb and qtgraphicaleffects change qtdeclarative and qtquick1 dependency on it to optional Change-Id: I6d1b60417d54c378c018d20d48fa6ce45776fbda Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* qt.pro: change qtfeedback dependency on qtmultimedia to optional.Toby Tomkins2012-05-231-2/+5
| | | | | | | | | | | qtfeeback currently has a hard dependency on qtmultimedia. qtfeedback only uses multimedia in the mmk plugin. This change modifies the build system only as all the required infrastructure changes in qtfeedback are already present. Change-Id: Ie9884dfd51fb040cde3e29247f1f51ea7f0bd637 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* qt.pro: Fix dependencies for qtgraphicaleffects.Toby Tomkins2012-05-231-1/+1
| | | | | | Change-Id: If96ee9b43cafbe3139234fa4ce822d282e7cff43 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
* Fix Qt Location dependencies.Aaron McCarthy2012-05-151-2/+7
| | | | | | | | | | | Qt Location has a soft dependency on qtjsondb. Declare a new soft dependency on qtsystems. This dependency is dependent on whether location shifting support for China is enabled. By default it is not. Change-Id: Id41451adb14e3c6cee0728ff343be85399fc4ac5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove dependency of qttools on qtscript from qt.pro.Friedemann Kleint2012-05-111-1/+1
| | | | | | | The experimental scripting feature of QtUiLoader was removed. Change-Id: Ied8ae2210815642ff6cc19f3546829736d5edacd Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* remove pointless $$IN_PWD/ prefixes on subdirsOswald Buddenhagen2012-05-051-28/+28
| | | | | | Change-Id: I26aac3952e9e2dea05be7db6300a5f97b44fe6e7 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* sort subdirs by dependenciesOswald Buddenhagen2012-04-111-25/+24
| | | | | | | | | not just using $$sort_depends(), so that the independent modules are still sorted more or less logically. Change-Id: I0c9630e338395997f7ee3cb40ef3028b8754af11 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add required dependencies for wayland moduleMarius Storm-Olsen2012-03-221-1/+1
| | | | | Change-Id: I3ca4e23052f93a57466045af1f76b3a36a7e2231 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Only add dependency to qtactiveqt if it's availableMarius Storm-Olsen2012-03-211-2/+4
| | | | | | | | | Don't need to be platform specific about it. Change-Id: I3ca981ec03b977961afaa18f09cde10b8b99c64e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QtSVG: Add dependency to declarative and quick1 if qtsvg is available.Toby Tomkins2012-03-131-1/+6
| | | | | | | | | | Currently there is a soft dependency on qtsvg that causes a build of qt5 to have unknown build order for qtsvg and other modules. This change makes it a hard dependency if the qtsvg module is available. Change-Id: Ic58a63f3f5f1d813ba832455c1ad3af41599926b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Don't try to compile wayland on Windows or Mac, even if checked outMarius Storm-Olsen2012-03-081-1/+1
| | | | | Change-Id: Ie66430e661b54aea4d17eb6e2e0fb7a351d62d97 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Added new module, qtgraphicaleffects.Sergio Ahumada2012-03-031-0/+7
| | | | | | | Not yet enabled by default. Change-Id: I96d770c504281c8e6bb452d6742ea555c1c7405c Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* QtLocation: Add hard dependency on qtjsondb to qtlocation.Toby Tomkins2012-03-011-1/+1
| | | | | | | | | | Currently there is a soft dependency on qtjsondb. This change makes it a hard dependency. Change-Id: Iba29c91093c3c6c67c4121f6f220e62686708040 Reviewed-by: abcd <amos.choy@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Fixed incorrect dependencies for qttoolsRohan McGovern2012-02-151-1/+1
| | | | | | | qttools uses both qtquick1 and qtdeclarative. Change-Id: I3ec8ef3d770b029bec865a67aaaad3eb9db464d5 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Add the QtQuick1 module.Andrew den Exter2012-02-091-2/+7
| | | | | Change-Id: I3afda68e1fa1dad4e264cea6e5afbd73d858c547 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add qtimageformats module to Qt5.Toby Tomkins2012-01-311-0/+5
| | | | | | Change-Id: Ie168a1a450b8090d4aa934a21e991c67683ef5de Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove QtQuick3D repository references from Qt5.Toby Tomkins2012-01-251-7/+0
| | | | | | | | | | | | | | | Qt3D had temporarily resided in the Qt5 repository under qtquick3d. There is now a qt3d submodule which is compiling and testing correctly. Qt5 had previously removed support for building the qtquick3d submodule by default. This commit is the final step in cleaning up the previous version. Task-number: QTBUG-22098 Change-Id: I39fdbd7c58a0076c288d8c0570e892b5d0df4ff9 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Danny Pope <daniel.pope@nokia.com>
* Qt5: Enable compilation of qtjsondb by default.Jyri Tahtela2012-01-201-3/+7
| | | | | | | | | Dependency to other modules (qtpim, qtdocgallery, qtsystems) is defined if qtjsondb is checked out. Change-Id: I0e0abc8d30733b9d7c1fdc666cd064fe6809442a Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Switch default builds from qtquick3d repo to qt3d repoRohan McGovern2012-01-181-3/+3
| | | | | | | | | | | | | Disable qtquick3d by default and enable qt3d by default. Make qtlocation depend on qt3d instead of qtquick3d. qtquick3d still exists for now, and can be explicitly compiled if necessary. Change-Id: If1013a9361b17421217beffd2dc1864c5e8502f3 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Laing <david.laing@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
* Added missing SUBDIRS+=module_qtjsbackendRohan McGovern2012-01-101-0/+1
| | | | | | | | Module cannot be compiled without this. Change-Id: I1ea3bd6f21b389db0c758abebd6e851a77a1d682 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Added qtjsbackend moduleSimon Hausmann2012-01-101-1/+5
| | | | | | Change-Id: I179a5714a12144e6815d931fef9fbfcedee6c93f Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated WebKit importSimon Hausmann2012-01-091-1/+1
| | | | | | | | | | | | | | The repository pointed at is now significantly smaller and contains a snapshot of WebKit only, excluding content like layout tests or their platform specific results. In addition the phonon dependency in qt.pro has been removed from WebKit, as it is not accurate. Change-Id: Ic2721435a6ce2328d11c1a8f5d9ce1881fc8ebb3 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* 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>