summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated submodules.v5.6.1-1Qt Submodule Update Bot2016-06-162-0/+0
| | | | | Change-Id: I66fd18223d8e3f66177f8e2063215f2ef00307a8 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Updated submodules.v5.6.1Qt Submodule Update Bot2016-06-013-0/+0
| | | | | Change-Id: Iad4d8ba6850bd7e47c9841268e3e09408a4c9c18 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Updated submodules.Qt Submodule Update Bot2016-05-281-0/+0
| | | | | Change-Id: I84d69ad4ee32f4a232d848f7e9c00bef57c07a3c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Updated submodules.Qt Submodule Update Bot2016-05-271-0/+0
| | | | | Change-Id: I674d7f94c1ae796eb82d7ba1a1cda42d7a2c3c0d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Updated submodules.Qt Submodule Update Bot2016-05-2614-0/+0
| | | | | Change-Id: I6c449bb5e347f932049af12686a5e43a77065de0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Updated submodules.Qt Submodule Update Bot2016-05-1831-0/+0
| | | | | Change-Id: Ie45483d44c61e3938b8fb3935c0f7542383d09b2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Adjust submodule branchesOswald Buddenhagen2016-05-061-34/+34
| | | | Change-Id: I33f74b67b3729011fe38aae7654fe962d6701774
* make it actually possible to specify 'ignore' as a classOswald Buddenhagen2016-05-051-0/+2
| | | | | | | another thing the doc claims to be possible - also quite reasonably. Change-Id: I2220245b10f02a778345b6549e345b2486630ffd Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* make it actually possible to exclude classesOswald Buddenhagen2016-05-051-11/+19
| | | | | | | the doc - quite reasonably - claims that it is possible. Change-Id: I4668b3feafe721f1db4deb65848206d8197962c8 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Updated submodules.Qt Submodule Update Bot2016-05-0527-0/+0
| | | | | Change-Id: I6230a59c886114184d74ad34651f04f0d296ade0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add script that install icu on RHEL 6.6Jędrzej Nowacki2016-04-281-0/+70
| | | | | | | That is translation from coin-setup golang code to sh script Change-Id: Ic26d3877e56feb8b7f8e3ccd3405a044fb6afd8e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Add script to install jom through powershellFrederik Gladhorn2016-04-287-0/+68
| | | | | Change-Id: I3f12aa0dd54f99fafdffb53796e54e7b127c3c8c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Add coin provisioning directoryFrederik Gladhorn2016-04-262-0/+13
| | | | | | Change-Id: I76c5c5b7a1ca41758964923d3eb5c9e644f468be Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Updated submodules.Qt Submodule Update Bot2016-04-258-0/+0
| | | | | Change-Id: I1586fb62199695f918f016ec9437810b0f9515e9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Updated submodules.Qt Submodule Update Bot2016-04-2124-0/+0
| | | | | Change-Id: I72e29c8b66acba249f6a274e6428e00a9804b4dd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* 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>
* | 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>
* 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.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>