aboutsummaryrefslogtreecommitdiffstats
path: root/qt.pro
Commit message (Collapse)AuthorAgeFilesLines
...
* Add new qtandroidextras repositoryv5.2.0-alpha1Sergio Ahumada2013-09-271-0/+1
| | | | | | | Also adding it as part of the default modules. Change-Id: I899ba6eec9ba6ab7103ecc6dba5245da16e01a32 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Merge branch 'stable' into devSergio Ahumada2013-09-111-1/+1
|\ | | | | | | | | | | | | Conflicts: qt.pro Change-Id: I21548a5c5c060939c58305bcbc5732d90f90bf82
| * qtwinextras: add qtdeclarative as an optional dependencyJ-P Nurmi2013-08-041-1/+1
| | | | | | | | | | | | | | | | qtwinextras contains optional QML types, so qtdeclarative must be listed as an optional dependency to avoid build breaks. Change-Id: I7d7f3bfca73c6599699a1da9c8795e6ac9ca4a74 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | purge qtjsbackendOswald Buddenhagen2013-08-171-1/+0
| | | | | | | | | | | | Change-Id: Ic761324c7b7afdfd509bea1db0d75ba259f8fb94 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Remove qtjsbackend as dependency for qtdeclarativeSimon Hausmann2013-08-131-1/+1
| | | | | | | | | | | | | | | | | | This is the first step. The next step is to remove it from qtdeclarative's sync.profile after this integrates. Change-Id: Ice1424f3d01d8eb4082200900498bbb19392492b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-07-111-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtactiveqt qtbase qtdeclarative qtdoc qtgraphicaleffects qtjsbackend qtmultimedia qtquick1 qtquickcontrols qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtxmlpatterns Change-Id: I5ca751a71375fba0c154db187e89bac6f3fa7ad1
| * Add qtmacextras and qtwinextras to qt5.git#stableSergio Ahumada2013-06-261-0/+2
| | | | | | | | | | Change-Id: I440e8ad733feaadb07e74fb91342434f66bae160 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Remove JsonDB from QtSystems and QtLocation dependency listAlex Blasche2013-06-211-2/+2
|/ | | | | | | There is no optional jsondb build anymore Change-Id: I902464dec14555794e80dde9eb81ca2dad2baeda Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* renamed qtwebkit-examples-and-demos => qtwebkit-examplesOswald Buddenhagen2013-05-011-1/+1
| | | | | | Change-Id: I66b3df6c472715c6600a07fe4746bb11bad81a21 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* skip modules whose mandatory dependencies are missingOswald Buddenhagen2013-04-181-2/+6
| | | | | | | | | so that for example "-skip webkit" will also skip qtwebkit-examples. Task-number: QTBUG-30307 Change-Id: I730830781ea5dabdccab88d19e82165f30dca8fe Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Add new modules (qtquickcontrols, qtserialport and qtx11extras)v5.1.0-alpha1Sergio Ahumada2013-04-041-0/+3
| | | | | | | | Also adding qtsensors as part of the default modules and updating its sha1. Change-Id: I39f89f2d26725575d791d185aa452bc1f420a8da Reviewed-by: David Faure (KDE) <faure@kde.org>
* re-add a bunch of modulesOswald Buddenhagen2013-04-031-2/+13
| | | | | | | | | | | | | | | this allows for easy cloning and build system maintenance also for modules which are currently irrelevant, thus hopefully keeping the barrier to their revival low. it does not affect the casual developer or the CI system, as init-repository will not clone these modules. This (abstractly) reverts commits 41c3f2cb5f633f0e540482ca01b2c2caa2475e57, 725a51b1d83626e16989804707356baa909c339f and 1117d4da2caf1989f63ca0a8073a799df80428bc. Change-Id: Iabc750642fc1c163f3ebc96cf6edaa9b04378094 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* make it possible to explicitly exclude particular modulesOswald Buddenhagen2013-02-201-2/+4
| | | | | | Task-number: QTBUG-26697 Change-Id: Id3f091be5803d922e129e6c3b5d9dfcdd297d18f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* semi-automate adding submodulesOswald Buddenhagen2013-02-201-109/+50
| | | | | | | this way adding a module actually becomes a one-liner Change-Id: Ie31039d36e948094c3ec241758eaab330304b194 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* don't make webkit build conditional on ICUOswald Buddenhagen2013-02-201-9/+5
| | | | | | | webkit now contains its own configure magic to disable itself. Change-Id: Ibb962fac8ea6275400879c15f24d21f0f8dee855 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* (re-)add top-level 'check' targetOswald Buddenhagen2012-12-041-1/+1
| | | | | Change-Id: I61316db0575bccf168525c7ff9230f675e7db78c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* re-instate a top-level docs targetOswald Buddenhagen2012-11-301-1/+1
| | | | | | | | | | now that it's not in default_post any more, each concerned repo needs to request it explicitly. as this is not a regular qt module, it happens a bit differently than elsewhere. Change-Id: I47f741e09add302fb4b1146be73da2f26a67a5af Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Merge remote-tracking branch 'gerrit/newdocs' into HEADSamuel Rødal2012-11-201-0/+2
|\ | | | | | | Change-Id: I1eeb68710f8129660f8d83dae924b23eda1401a5
| * Add prepare_docs to CONFIG as preparation to two-pass doc buildsTor Arne Vestbø2012-10-251-0/+2
| | | | | | | | | | | | | | Won't have any effect until the corresponding patch lands in qtbase. Change-Id: I807ca48d3e2ab671f0d56eea27f72455304d367b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 05:33:10 +0000