aboutsummaryrefslogtreecommitdiffstats
path: root/qt.pro
Commit message (Collapse)AuthorAgeFilesLines
* Remove specific rules for QtWaylandCaroline Chao2015-04-011-1/+1
| | | | | | | | | | Let the module handle the platforms by itself. See QtWayland change: 0448026b4ee75 Change-Id: I622d17d6219e71fb0ad014442763b515e58079af Reviewed-by: Sergio Ahumada <sahumada@texla.cl> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Add qtdeclarative as optional dependency for qtlocationAlex Blasche2015-02-171-1/+1
| | | | | Change-Id: Id6d406cd98b64ba111d1eb9cb0b03360a05fbca7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Add qtcanvas3d as submodulePasi Keranen2015-02-131-0/+1
| | | | | | | | [ChangeLog][General] Added QtCanvas3D module, a JavaScript 3D rendering API for QtQuick. Change-Id: I9448f87ba8c8ccfb2dd6cf790d29bb561b9e9740 Reviewed-by: Pasi Keränen <pasi.keranen@digia.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* QtWebEngine: add dependency on QtWebChannelPierre Rossi2015-02-111-1/+1
| | | | | | | | | | To allow using the integration that makes use of a custom transport over Chromium IPC. Also add QtLocation as an optional dependency for correctness, and update the pinned sha1 Change-Id: I71d88be0859a74ad82f539d00f02b51d1c3e5218 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* QtLocation doesn't depend on QtMultimedia anymore.Alex Blasche2015-02-041-1/+1
| | | | | Change-Id: Id75a7fc591064639a38694149517924dd33b56fb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Qt3D depends upon qtimageformats moduleSean Harmer2014-12-301-1/+1
| | | | | | | | Qt3D makes use of the webp image format in its examples to minimize the size of assets. Support for webp is provided by qtimageformats. Change-Id: Id70b584123dc6174848947029ee034593ccc42e0 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* remove qtjsondbJoerg Bornemann2014-09-231-2/+1
| | | | | | | | | It's dead, Jim. Change-Id: Id8e1ddb266018bfd582af27bb7eb860287e4567c Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Marco Bubke <marco.bubke@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add qtwebengine as submoduleFrederik Gladhorn2014-08-291-0/+1
| | | | | | | | | | | qtwebkit is listed as an optional dependency for qtwebengine to ensure that qtwebkit and qtwebengine are not linked in parallel on the CI system. Otherwise we could run out of memory. Change-Id: Ib80d72407df03037c928d99f55c8e04e98e506d9 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add QtWebChannel as optional dependency of QtWebKit.Milian Wolff2014-08-151-3/+3
| | | | | | | | | | This is required to prepare the merge of the integration patch. The QtWebChannel and QtWebSockets lines in qt.pro are moved such that they occur before their first use in QtWebKit. Change-Id: Ie8137da57827776fe7b1434538df6b08108b0349 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Build Wayland on Linux (except Android)Frederik Gladhorn2014-08-141-1/+1
| | | | | | Change-Id: Ief1276f88837885637d0e60c90c4713bd12f6c85 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* Add qtwebchannel as submoduleFrederik Gladhorn2014-08-081-0/+1
| | | | | | | | This also updates the qtwebsockets revision since that's needed to compile. Change-Id: I9f3564c78d08abdca73ce395f31b3031a829e502 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Remove jsondb from qtpim dependency listAlex Blasche2014-06-181-1/+1
| | | | | Change-Id: Icf05e7857b02db74c7309d796be7ef259cf83e37 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-05-261-2/+1
|\ | | | | | | Change-Id: Ib1694808847f26576cc3c7780bd1c6d3689a8a26
| * don't claim that multimedia needs quickOswald Buddenhagen2014-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | it's a soft dependency and it appears to be properly checked in the subprojects. Task-number: QTBUG-38616 Change-Id: I5ada1f91247ba3668015e95d6da9c5996f1a138c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * nuke qlalr submoduleOswald Buddenhagen2014-02-221-1/+0
| | | | | | | | | | | | | | | | it was merged back into qtbase. Change-Id: Ia5e6252ac13b0f821807c825eea611d484c1dd7b Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Remove qt3d from qtlocation's dependency listAlex Blasche2014-04-021-1/+1
|/ | | | | | | | QtLocation no longer depends on Qt3D. Change-Id: I0418dcc93a97722948bddcdd4f754914d7eaa019 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Add qtwebsockets as submoduleFrederik Gladhorn2014-02-171-0/+1
| | | | | | | | | | | This just adds the module, it doesn't yet make it part of Qt 5.3 or anything like that Change-Id: Icd42c4d2366e31298758a6ef82924bfb64a9f814 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge branch 'stable' into devFrederik Gladhorn2014-01-291-3/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtactiveqt qtandroidextras qtbase qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmacextras qtmultimedia qtqa qtquick1 qtquickcontrols qtrepotools qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtwinextras qtx11extras qtxmlpatterns Change-Id: I404135b8463e4cdfc6a235f8c2203ea8ddfa3df5
| * don't unnecessarily confuse qt creatorOswald Buddenhagen2014-01-231-0/+1
| | | | | | | | | | | | | | | | | | | | our CONFIG+=build_pass hack has the side effect that qmake does not emit the calling command line to the makefile, which makes creator unable to detect the build. so revert the hack as soon as it did its deed. Task-number: QTBUG-34788 Change-Id: I4c0fd28d661ca5049f31d5405e84525efb12fd4e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Add qtenginio as submoduleFrederik Gladhorn2013-11-011-0/+1
| | | | | | | | | | Change-Id: Ida65ce0162fa65c37413ce6716eb6382e1593338 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Refine qt-module dependencies for massively parallel buildsAllan Sandfeld Jensen2013-10-241-3/+3
| | | | | | | | | | | | | | | | | | | | QtWebKit should be build after QtMultimedia for multimedia support on Mac and Windows. QtScript should be build after QtTools because an example uses UiTools. Change-Id: Id92efac72d8c2c2237f21fad1ab823c1c1ac95dd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Add QtAndroidExtras to dependency list of QtConnectivityAlex Blasche2014-01-141-1/+4
|/ | | | | | | | | | We only need it for Android builds though. Change-Id: I760dfd6038da2d4061326dd361ac517c9e674239 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qt.pro: Fix dependencies for qtconnectivitySergio Ahumada2013-10-081-1/+1
| | | | | | | | | Remove the hard dependency on qtsystems and changing it with a hard dependency on qtbase and a optional dependency on qtdeclarative instead. Change-Id: I96a4d3b38df588489e5ff4a704ea1e4fcbdb620c Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Mark qtmultimedia as an optional dependency for qtwinextrasJ-P Nurmi2013-10-081-1/+1
| | | | | | | | | The QtWinExtras Music Player example uses QtMultimedia. Change-Id: Ib720710a8563d6bfa39aec8b82e9a87517b7e015 Reviewed-by: Mandeep Sandhu <mandeepsandhu.chd@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 22:39:06 +0000