aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * don't use POD, to restore msysgit perl compatibilityOswald Buddenhagen2015-12-251-112/+83
| | | | | | | | | | Change-Id: I360a6d5246e33dcf3f72bc83f2790905af8c1463 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * don't use GetOptionsFromArray, to restore msysgit perl compatibilityOswald Buddenhagen2015-12-251-4/+4
| | | | | | | | | | Change-Id: Ic02a5d8b5a8a813a23bed1c0b45bcb8ee47e3edb 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>
| * Updated submodules.Qt Submodule Update Bot2015-12-2413-0/+0
| | | | | | | | | | Change-Id: Icf4a1303edde9048adcb9bb40ced1b503a170f22 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Updated submodules.Simon Hausmann2015-12-179-0/+0
| | | | | | | | | | Change-Id: I701ce99cb7eb7fa8daffa67699920f51a7ab2087 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Updated submodules.Simon Hausmann2015-12-169-0/+0
| | | | | | | | | | Change-Id: I806a9fb4b31adf8c02e00c2320d53f7d7fe3669e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Updated submodules.Simon Hausmann2015-12-174-0/+0
| | | | | | | | | | Change-Id: I5d7279982a017ef903991faa89c79ca10e717497 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Enable qtpurchasing by defaultLiang Qi2015-12-161-0/+1
| | | | | | | | | | Change-Id: I4030b9f446a865e758492e2f07b8adb19052e91d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Manually update qtpurchasingLiang Qi2015-12-161-0/+0
| | | | | | | | | | Change-Id: I7385116d7c6e9a7f9b7b2be4b76468b8459299dd Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-155-13/+39
|\| | | | | | | Change-Id: Ibd5caf0448c9eba9251bc9395fe647f1955743f0
| * Updated submodules.v5.6.0-beta1Simon Hausmann2015-12-1515-0/+0
| | | | | | | | | | Change-Id: Iba5d9c28367748258013888c93ab773eb05bb0ee Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Updated submodules.Simon Hausmann2015-12-1014-0/+0
| | | | | | | | | | Change-Id: Ia00cca2d8c22ff96a4f871d70eaa9eb55f6391b0 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Updated submodules.Antti Kokko2015-12-0816-0/+0
| | | | | | | | | | Change-Id: Ic83700e48f40b0ee8e76f4b4e44b28b4c85bebb7 Reviewed-by: Simon Hausmann <simon.hausmann@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>
| * Updated submodules.Antti Kokko2015-12-0119-0/+0
| | | | | | | | | | Change-Id: Id124a31338548d9a76baa908b281b3bb6ede168a Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
| * Updated submodules.Frederik Gladhorn2015-11-1611-0/+0
| | | | | | | | | | | | Change-Id: Id3463e24f1aecc6e2d4d040bc7878ad1d48f6327 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 12:33:15 +0000