summaryrefslogtreecommitdiffstats
path: root/qt.pro
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-261-2/+2
|\ | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: Ifa5edde4cfd68df959fabb6a61595d8c1b28b099
| * Merge remote-tracking branch 'origin/5.6' into 5.9.0Liang Qi2017-05-081-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Change-Id: Id82a13a6b2fe6db60c286e470396298c08e363b8
| | * get rid of custom 'qt' gitmodules propertyOswald Buddenhagen2017-04-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead, re-use the (also custom) 'project' property with the magic value '-' to flag modules which contain no project files at all. Change-Id: I33163c098852e1b79ad698115aac98217efe1157 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | make -skip work with configure -redoOswald Buddenhagen2017-05-251-0/+2
|/ / | | | | | | | | | | | | | | the handling of -skip happens outside the usual argument handling, so we need to handle -redo manually as well. Change-Id: I7dcdf729bd9db2ff2ac8dc08bac71462bf30814b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.9Liang Qi2017-04-081-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules qt.pro Commit ed8f84f149f6901cbca50d145b25fe5f43a2d54c (webengine needs tools) together with commit 5656b4848e8c8bf60274c36094dede63aa93e89b (webkit needs webengine) creates a circular dependency with qttools also depending on webkit. So this commit breaks it by swapping the serialization order between webkit and webengine. Change-Id: I36309908adb754072495e02785ad158f8b389548
| * serialize build of qtwebkit and qtwebengineOswald Buddenhagen2017-04-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | linking both at the same time requires more than my 16GB of RAM, so introduce a .gitmodules field which serializes the two. in practice, it is just interpreted as an optional dependency. the CI system won't be taught about it, so this will not cause an unnecessary serialization there. Change-Id: I938537ebd3767a1184a5a31c4c026c70a05d499a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Remove QT_SKIP_MODULES declarationJake Petroules2017-02-151-4/+0
| | | | | | | | | | | | | | These exclusions belong in the individual modules. Change-Id: Iaa868bf953f7bc3d72b6508272a18798a8569f4d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | automatically launch new configure system in top-level buildsOswald Buddenhagen2016-09-151-4/+27
|/ | | | | | | | | | | | | | | | | this includes moving the -skip option here, where it belongs. the implementation is a bit hacky, but the proper one would be vastly more complex: we'd have to load all modules, then parse the command line properly (the -skip parsing would be a custom callback, to avoid needing to process features), then discard all now excluded modules again, then re-process the command line (so we can complain about options which are now invalid), and only now proceed with the actual feature processing. that seems a bit over the top, so we accept that -skip cannot be the argument of another option, which seems quite reasonable. Change-Id: I0053658e6d7e11b82cdfe55893cb553b664a9298 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* move module dependencies from qt.pro to .gitmodulesOswald Buddenhagen2016-01-221-81/+52
| | | | | | | | | | | | this removes the last redundant module list. the module build order which is not determined by dependencies is pretty random now. this is avoided for a few heavy and "less relevant" modules by setting a priority to built them as late as possible. Change-Id: Ie8ef9777d050a4915cd2282dc9ccb48fcdbc02d2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* make qtandroidextras a regular optional dependency of qtconnectivityOswald Buddenhagen2015-12-251-4/+1
| | | | | | | | | | | | we want to move to a purely declarative way to declare submodules, so the conditional has to go. instead, use an optional dependency to ensure build order, while the module excludes itself via requires() if its dependency is missing. Change-Id: I615382700ff601c9ab003d131b2cc600441c514c Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* error-check dependency declarationsOswald Buddenhagen2015-12-011-0/+6
| | | | | | Change-Id: I98ad68d8be608b144c5f2ff422aaf7baab9907e8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* declare mandatory dep serialbus => serialportOswald Buddenhagen2015-11-131-1/+1
| | | | | | Change-Id: I35c5f18b7c8856071413e50590308f402be7e528 Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix dependency order for qtlocation and qtwebviewLaszlo Agocs2015-10-221-3/+3
| | | | | | Change-Id: Ie61b69be3b38975675fff3553d1f5c9510e7865e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* declare qtgraphicaleffects before qtquickcontrolsOswald Buddenhagen2015-10-121-1/+1
| | | | | | | | | otherwise the dependency is botched. amends 30e19df5b. Change-Id: I8e17d2f91c7c55c49be6239268f928ae4577d17c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add qtserialport as dependency for qtlocationLaszlo Agocs2015-10-091-1/+1
| | | | | | Task-number: QTBUG-48082 Change-Id: I7b90777bfdd1286f6340caf756562146772d0bb3 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add a way to build just a few of Qt's modules more easilyThiago Macieira2015-09-241-0/+1
| | | | | | | | | | | | | | The current way requires passing -skip to configure, which is a list of what not to build. To set a list of what to build (e.g., for testing, in a specialized build, etc.), there was no way. Now you can just do: qmake "QT_BUILD_MODULES=qtbase qtdeclarative qtsvg qtxmlpatterns" (the order doesn't matter) Change-Id: Ifcaefa35b16b137866ca839a483ce366e35de7ab Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Add qtpurchasing as non-default moduleFrederik Gladhorn2015-09-241-0/+1
| | | | | | | For 5.6 this is a tech preview, it will be added properly in 5.7. Change-Id: I709830fbcfc439d5446718093f0c16ad2dcb1e57 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Add QtQuickControls2 as submodulev5.6.0-alpha1Frederik Gladhorn2015-09-031-0/+1
| | | | | Change-Id: I435fb765b48a978763384226e399b33448a40502 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Hook qtserialbus into qt5.gitAlex Blasche2015-09-031-0/+1
| | | | | Change-Id: I17c8c55205f852b3e79f279cad7b87f403d7fbe7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Add qtwebview as submoduleFrederik Gladhorn2015-09-031-0/+1
| | | | | | Change-Id: I6a69b08945767f4cb8f4164630c726cf8bf552bb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Removed QtWebkit and QtWebkit-Examples from qt5.gitJani Heikkinen2015-09-031-2/+2
| | | | | | | | | QtWebkit (and QtWebkit-Examples) were deprecated in Qt 5.5 and will now be removed from qt5.git in Qt5.6 release Change-Id: I86e1072141956136fa5e4220cdcdf812492453b3 Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Add qtgraphicaleffects as an optional dependency for qtquickcontrols.Mitch Curtis2015-08-131-1/+1
| | | | | | | | | This is a prerequisite to making qtgraphicaleffects a dependency in qtquickcontrols' sync.profile. Task-number: QTBUG-46393 Change-Id: I3679392a7feb48ecefa4a01a7ecb42b2e6287ecb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Add qtquickcontrols as an optional dependency to qtlocation moduleAaron McCarthy2015-06-261-1/+1
| | | | | | | | | With the correct modules checked out 'make module-qtlocation' will build everything necessary to run the examples. Change-Id: I0c63221b5704c2b13495f3dc3221e888d8e9547c Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* qtdeclarative is an optional dependency for qtwebkitMichael Olbrich2015-06-051-1/+1
| | | | | | | | | | | | This way qtwebkit can be built when qtdeclarative is disabled. This is especially useful for targets without OpenGL. Also add qtxmlpatterns to the optional dependencies. It was an indirect dependency before via qtdeclarative. Change-Id: Ib4c29b958bd63d528fba8ec326e2dbc1ea8bce08 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* 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