aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added qtdeclarative and qtmultimedia as optional dependencies for qtspeechv5.7.0-beta1Dominik Holland2016-04-131-0/+1
| | | | | Change-Id: I20602133a2156b162e99432f868e4925469c7ff5 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Updated submodules.Qt Submodule Update Bot2016-04-1313-0/+0
| | | | | Change-Id: I875e16060956af433e20acff4fbdcfb54d0d9923 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Updated submodules.Qt Submodule Update Bot2016-04-1133-0/+0
| | | | | Change-Id: Idc9529f02cc9a5ad4cd300a745b559fea9c94ed4 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Update 5.7 module statusJani Heikkinen2016-04-111-2/+2
| | | | | | | | | | In Qt 5.7 enginio is obsolete and Qt3D addon, not TP anymore Change-Id: I019f76162cfcc853b542695245a983f151f1b072 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-052-9/+15
|\ | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: If63e4f4f7d9a7ddba01d4e621fe6bfbc60838d26
| * Updated submodules.Qt Submodule Update Bot2016-04-0415-0/+0
| | | | | | | | | | Change-Id: I983429d487f7667c36553d24037639abee660b42 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-03-312-10/+16
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: Ic9c8564006c2722f925700f09ff42da3e912f580
| | * Update .gitmodules for automated release src package creationv5.6.0Iikka Eklund2016-03-082-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce new "deprecated" value for status attribute. We have two flavors of big source packages we need to produce: qt-everywhere-* which needs to include: - essential - addon - preview - deprecated (e.g. qtscript and qtenginio for Qt5.6 release) Installer only specific source package: - essential - addon The rest (deprecated, preview, ...) need to be shown as split src packages in the installer. The above leads to the following changes: qtscript: addon -> deprecated Needs to be part of big src packages but excluded from installer specific big source package. qtenginio: obsolete -> deprecated We can't exclude this module from qt-everywhere src packages. qtwayland: preview -> addon Needs to be part of installer specific big src package and the module status is not preview anymore. Change-Id: I52e10629bf81860f56ebc4ce9d395e0ca54c4264 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * Updated submodules.Qt Submodule Update Bot2016-03-047-0/+0
| | | | | | | | | | | | | | | Change-Id: Id993273e16fbbffd43d958419ab103a857fd1346 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * Updated submodules.Qt Submodule Update Bot2016-03-034-0/+0
| | | | | | | | | | | | | | | Change-Id: I49c2a3948ba6c7e8a12f1077b96ddbde1453f67e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * Updated submodules.Qt Submodule Update Bot2016-02-2711-0/+0
| | | | | | | | | | | | | | | Change-Id: I3459d79f2daa9d681759f0cb7b8c841aeae7179a Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * Updated submodules.v5.6.0-rc1Qt Submodule Update Bot2016-02-194-0/+0
| | | | | | | | | | | | | | | Change-Id: Ife7e51372a57f53efefc1fe0c8c805442908d8d9 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * Updated submodules.Qt Submodule Update Bot2016-02-167-0/+0
| | | | | | | | | | | | | | | Change-Id: I6ad2f0dfbfb78f8f4d9c20f81a84803472a4b31c Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * Updated submodules.Qt Submodule Update Bot2016-02-155-0/+0
| | | | | | | | | | | | | | | Change-Id: I444b4f3ddbb851d94abda55e2e2dfcfee3921d94 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * | Updated submodules.Qt Submodule Update Bot2016-03-2934-0/+0
| | | | | | | | | | | | | | | Change-Id: I85bb46a7180a32c1808574d0a54c51703d4cee12 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Updated submodules.Qt Submodule Update Bot2016-04-0411-0/+0
| | | | | | | | | | | | | | | Change-Id: I1c0bcd2c582276c04e44e88169807cc7cf5b43c3 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | | Updated submodules.Qt Submodule Update Bot2016-03-2934-0/+0
| | | | | | | | | | | | | | | Change-Id: Ie0c625f6a48fe8d05150bd12f4d92beb2a359ec7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Updated submodules.v5.7.0-alpha1Qt Submodule Update Bot2016-03-0812-0/+0
| | | | | | | | | | | | | | | Change-Id: I5622046dbc1f8eee0cda929627fb8873d525b02a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Updated submodules.Qt Submodule Update Bot2016-03-0317-0/+0
| | | | | | | | | | | | | | | Change-Id: I94c3646dc3309f71f577c6f41241cb2570d0c598 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | | QQC2 doesn't depend on QQC1BogDan Vatra2016-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | QQC2 depends on qtgraphicaleffects. Change-Id: I6cc53d46cf9f4a140dff570801f13556da0d3961 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | | Updated submodules.Qt Submodule Update Bot2016-02-2511-0/+0
| | | | | | | | | | | | | | | Change-Id: Id60487a24eb193207d4d8837a91cef1abc19f97f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Updated submodules.Qt Submodule Update Bot2016-02-2434-0/+0
| | | | | | | | | | | | | | | Change-Id: I633ba6875269578aae2f9d28062d3fa78924a5fc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Simon Hausmann2016-02-242-61/+122
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-02-192-61/+122
| |\| | | | | | | | | | | | | | Change-Id: I2bc1389ece7f12efc334f0292edbbea837f9adc2
| | * | rework hook installationOswald Buddenhagen2016-02-171-16/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the primary purpose of this change is making it work with new-style submodules (1.7+) and git-worktree (2.5+). this means resolving '.git' and 'commondir' files. we avoid calling git commands, because a) it's slow on windows, b) some of them are unavailable in older git versions and it's tedious to deal with that and c) their output is not necessarily optimal (not always absolute paths). we also don't use relative paths for the hook locations any more, as that's too tedious to deal with. Change-Id: Ie341e748e56d6bef40856e4a49ac368850028d83 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * | Updated submodules.Qt Submodule Update Bot2016-02-1740-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I020482ae1107cdd56fad485007622cb4b62b8032 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * | Merge remote-tracking branch 'origin/5.6.0' into 5.6Oswald Buddenhagen2016-02-122-40/+82
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: Ic3c425211f24b0dc3a341cac7d9fd9d0b7edac03
| | | * Updated submodules.Qt Submodule Update Bot2016-02-1013-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I8740e98ba27c1f554366a5183c6972207f0b0061 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| | | * fix branches of some modulesOswald Buddenhagen2016-02-071-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all repos which are released (whichever way) need release branches. and vice versa. also, it needs to be the *right* release branch. Task-number: QTBUG-50695 Change-Id: Id7b5d106d2d9bdf70e9d5276e205a3c7ea827144 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | | * Updated submodules.Qt Submodule Update Bot2016-02-0723-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic407bd126cc4c0a557ec7769d41394aa68c0cbee Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | | * properly complain about invalid entries in --module-subsetOswald Buddenhagen2016-02-071-0/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I13ec7a6acdc8a47efea14bfabf0413d8a3570870 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | | * replace 'initrepo' with more fine-grained 'status'Oswald Buddenhagen2016-02-072-39/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of a simple bool, we now have five states: preview, active, addon, obsolete, and ignore (the default). the default includes the first three. the CI system is expected to use --module-subset=all,-ignore to include everything that is expected to build (in some configurations). Change-Id: Ifb43412054a8e42db0425f24f8e53acfce363caa Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | | * Adjust submodule branchesOswald Buddenhagen2016-01-251-30/+30
| | |/ | | | | | | | | | Change-Id: Id78b6c131063a8d25616282cd3b76815323e8048
| | * Updated submodules.Qt Submodule Update Bot2016-01-224-0/+0
| | | | | | | | | | | | | | | Change-Id: I88b34da37a589451ae32c6f736f4dc863715b339 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Enable QtGamepad usage in Qt3DBogDan Vatra2016-02-221-0/+1
|/ / | | | | | | | | | | | | If Qt3D finds QtGamepad, it will use it to build gamepad support. Change-Id: Ifbc40e5e04a6030d25c2d429878d4fb3a3dd11a6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Updated submodules.Qt Submodule Update Bot2016-02-157-0/+0
| | | | | | | | | | Change-Id: I5861620b6214dc5ff124672ce21dd4dd5b25ce85 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Adjust submodule branchesOswald Buddenhagen2016-02-121-42/+42
| | | | | | | | Change-Id: I3484da8952951d818e9f584bf9b57e9bb9b1e430
* | Updated submodules.Qt Submodule Update Bot2016-02-1233-0/+0
| | | | | | | | | | Change-Id: I6901259b7a01e57d0c8ca2a9f40d9501635f5cc0 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Fix datavis3d dependenciesSimon Hausmann2016-02-121-1/+1
| | | | | | | | | | | | | | | | The qtmultimedia dependency was missing for datavis3d. Change-Id: I91007c210e58aa9985844a8234781356391bfbad Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | add qtgamepad, qtscxml, and qtspeechOswald Buddenhagen2016-02-124-0/+18
| | | | | | | | | | Change-Id: I14bc475d44367a9102e896976eba5bd191ee232d Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Add charts, data visualization and virtual keyboard modulesMiikka Heikkinen2016-01-254-0/+21
| | | | | | | | | | Change-Id: I53cbc4ce3c2e44687ce454498f5def820614db85 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Updated submodules.Qt Submodule Update Bot2016-01-2330-0/+0
| | | | | | | | | | Change-Id: I790e982492004e93953bed503a1d777d27c28b6f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devSimon Hausmann2016-01-224-201/+204
|\| | | | | | | Change-Id: I62519dfde84c16a7dfe1b6f225e40e6f16d3105c
| * Updated submodules.Qt Submodule Update Bot2016-01-2212-0/+0
| | | | | | | | | | Change-Id: I2c671f50d878e8ed03418c2a59c8c997ed3bd6f4 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * move module dependencies from qt.pro to .gitmodulesOswald Buddenhagen2016-01-223-82/+117
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Updated submodules.Qt Submodule Update Bot2016-01-196-0/+0
| | | | | | | | | | Change-Id: Ie0cf0058a5e8f383be4608a5c094b610b9a575af Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2016-01-1816-0/+0
| | | | | | | | | | Change-Id: Ia4dbb4d02b5c32c76cd9cbdc320709af668dc4bc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2016-01-1713-0/+0
| | | | | | | | | | Change-Id: I3ce0cb4e9ea44dcd860b48d3a6ecaad0eb31964f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2016-01-1219-0/+0
| | | | | | | | | | | | Change-Id: Iff91870d954d24d2649334d2eeb8357e483009b3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2016-01-059-0/+0
| | | | | | | | | | Change-Id: Ibacf35a5fb113f9b54a96c10d52aa70e2e64f8da Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 16:16:08 +0000