aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated submodules.v5.4.0-rc1Qt Submodule Update Bot2014-11-214-0/+0
| | | | | Change-Id: I7c0bc2305680fac216bbaa72ac83f65b04feffff Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Updated submodules.Qt Submodule Update Bot2014-11-203-0/+0
| | | | | Change-Id: I4b199501287c5a5961405ae0667c04dc1188af44 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Updated submodules.Qt Submodule Update Bot2014-11-1911-0/+0
| | | | | Change-Id: I96d903eec0ee9d2fd76e1e3f1ebfd868ad937dbe Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Updated submodules.Qt Submodule Update Bot2014-11-1214-0/+0
| | | | | Change-Id: Ie8053418e43127327f6df892ae774a1707a9ae97 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* don't fetch unless we are updatingOswald Buddenhagen2014-11-121-1/+1
| | | | | | | | it's just wasting time. Change-Id: I541cc535c5c95b0140cfa14d7cb042dbe029525e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Fix cloning with mirrorsKai Koehne2014-11-121-1/+0
| | | | | | | | | | Commit 486f5f37761 broke the cloning with one of the mirror options: git ls-remote git://mirror/qt/qtactiveqt.git.git test/if/mirror/exists fatal: The remote end hung up unexpectedly Change-Id: Ia154ee34dd10e35b24676777d8dde98ef0790ee1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fix description of --mirror argumentKai Koehne2014-11-121-1/+1
| | | | | | | The argument actually requires a trailing slash. Change-Id: Idc2567746d2b3f4ebf31c2bce5ec683d2a1f425b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* teach init-repository about branchesOswald Buddenhagen2014-11-122-4/+65
| | | | | | | | specifically, add the --branch option and the necessary keys to .gitmodules. Change-Id: I09e2df6bd012629f76a35238d66697637bdffe44 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-11-105-0/+0
| | | | | Change-Id: I201b4c135a571bdf2621cbac03a9ab46a352b60f Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Updated submodules.Qt Submodule Update Bot2014-11-048-0/+0
| | | | | Change-Id: Ica7018cd4f892d0b6938ab276305f6ae02dcc07b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Ignore alternate if its not a git repoJan Arve Saether2014-11-031-1/+1
| | | | | | | | Don't just check if the submodule folder exist, since that doesn't qualify it for being a valid git repo. Change-Id: Ia3902714a0554908c0b8fd3228ed6fc2cfddd344 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Updated submodules.Qt Submodule Update Bot2014-11-037-0/+0
| | | | | Change-Id: I00e3f00b799e15d95895f70887cf5b1b6d3bc372 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Updated submodules.Qt Submodule Update Bot2014-10-318-0/+0
| | | | | Change-Id: Ia87766e218ab82cd1da216ea2cd023790fea6e8c Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-10-309-0/+0
| | | | | Change-Id: Ib54838f4a5c3ad05843c680252c45458a4572fb5 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-10-2911-0/+0
| | | | | Change-Id: I18cc387deb811a2870842837353d6322511e1872 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-10-2814-0/+0
| | | | | Change-Id: I86f7d9ce9873b5c6897e99763aba5765640ceba3 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-10-2316-0/+0
| | | | | Change-Id: I3f0739b279123e0a049d52da455f40ad1a20b4ab Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* fix to let init-repository work on non english localeBruno Coudoin2014-10-171-0/+2
| | | | | | | | This patch forces the C locale before calling 'git submodule' in order to get the non localized string 'Entering' that we filter out. Change-Id: I46d3770956a6b07e574ad15549bbb8942285b800 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Updated submodules.Qt Submodule Update Bot2014-10-1723-0/+0
| | | | | Change-Id: Id8a40d65705b36a269accb68f7d82d7ee5fa925f Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated submodules.v5.4.0-beta1Qt Submodule Update Bot2014-10-1323-0/+0
| | | | | Change-Id: I2f80b640ab55f99b2379a41e6ce8c7df30f138a4 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-10-019-0/+0
| | | | | Change-Id: Ib927255703d49def6c732f196a6265f6ed08a691 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-09-3016-0/+0
| | | | | Change-Id: I361f771ae66d1128f407992c228c1c76b0e69e4c Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-09-258-0/+0
| | | | | Change-Id: Ie6af514f7185fc618f5093accedfb4f0937e5039 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Adding qtquick1 and qtwayland also into submodule initializationMatti Paaso2014-09-251-0/+2
| | | | | | | | | | | Without these components, src package creation fails in packaging. Change-Id: I402c9c49642bccf821c3719206d1dea9415760c6 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Antti Kokko <antti.kokko@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-09-244-0/+0
| | | | | Change-Id: Ib2e577904b850ea2ba3a8223688b05a21b4921f7 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* remove qtjsondbJoerg Bornemann2014-09-233-5/+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>
* properly recurse submodule initializationOswald Buddenhagen2014-09-231-10/+11
| | | | | Change-Id: Icd438b9da9af0275dd508186a265bc211d9d01ce Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* don't unnecessarily initialize unwanted submodulesOswald Buddenhagen2014-09-231-4/+3
| | | | | | | it wastes time and causes output noise. Change-Id: Ifee01150293431b3c528f30a46280bd142e30b22 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* don't uninit submodules before re-initingOswald Buddenhagen2014-09-231-10/+1
| | | | | | | | | git-submodule init will simply not touch the already initialized submodules. this is just fine, as we'll overwrite the config entries with our own urls (and remove the obsolete ones) afterwards anyway. Change-Id: I6372bd48be9792e456899dc829226921990140c4 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* keep information about default repos in .gitmodulesOswald Buddenhagen2014-09-232-36/+35
| | | | | | | it's backwards to keep this in the script itself. Change-Id: I4248ba3fef984bdff5d034cb2e6db6cae3209d68 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* don't pass around url unnecessarilyOswald Buddenhagen2014-09-231-6/+17
| | | | | | | we now have everything we need to construct it on the fly. Change-Id: I129e49bbcf46428d0fcef31ab8188df9d6a4026c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* get submodule urls from .gitmodulesOswald Buddenhagen2014-09-231-75/+42
| | | | | | | keeping a redundant copy in the script is plain backwards. Change-Id: Ibdd1bab9d2cb5af7d7747d5caa2afc7d6e7571ad Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* rewrite submodule exclusion logicOswald Buddenhagen2014-09-231-67/+39
| | | | | | | | | | | instead of doing multiple passes over the submodules, do everything in one go. as a bonus, as the internal structure uses exclusion entries in the module list, we can make that feature user-accessible just as well. Change-Id: I8bfb30c8051a9150f92e2e124ff52f64e3efe03c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* nuke the --http optionOswald Buddenhagen2014-09-231-31/+3
| | | | | | | | | it was a vestige from the times when the submodules had absolute urls pointing at git://gitorious.org. as we now use relative urls, things work just fine without that option. Change-Id: I5e93ff8cd2497a27cfbdd53dbcf9db3cd0c4cd1d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-09-2328-0/+0
| | | | | Change-Id: I919c0332ff9f5ad1979de3105721c2ba5aacf634 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-09-159-0/+0
| | | | | Change-Id: I1e275c54ea722d4f882cf329b65b749aa4d45fb2 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-09-1114-0/+0
| | | | | Change-Id: I5fdb4490cb85b3470bdbd81de9dccbe6bcb96460 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* init-repository: Support cases where $submodule/.git is a fileJocelyn Turcotte2014-09-101-1/+1
| | | | | | | | | | | | Since git 1.7.8 the $GIT_DIR of the submodule can be a reference to the super-module's $GIT_DIR/modules/<name>/ Test for existence instead of testing for a directory before attempting a git clone there. Change-Id: Ic539e770067da1417a2ad374c21253212473abe6 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Updated submodules.v5.4.0-alpha1Qt Submodule Update Bot2014-09-0712-0/+0
| | | | | Change-Id: I74d7cf7e426ba4e1aa640ac986fbbe52d1e82897 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-09-049-0/+0
| | | | | Change-Id: If16e291eea490110a9749b65fa4d21988376755a Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-09-029-0/+0
| | | | | Change-Id: Iaa47c338f81e080e1fde4501e72ee48c9330e1be Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-09-017-0/+0
| | | | | Change-Id: I2159de889d951926d780041338d948f4a1281aa3 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-08-313-0/+0
| | | | | Change-Id: Ifefebb996cc9dcb2cc2b06f57315a4a679f96420 Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-08-3016-0/+0
| | | | | Change-Id: I2c3556629bab77b013eabcf6535512e902837e40 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated license files in Qt5Jani Heikkinen2014-08-304-684/+475
| | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I49f5a4bf3481d6cd712301092f5f20a5dac470cf Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add qtwebengine as submoduleFrederik Gladhorn2014-08-294-0/+6
| | | | | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2014-08-2730-0/+0
| | | | | Change-Id: Ie073b25926d4c538cb9f41d4c59d171857a60ede Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Add QtWayland to default checkoutFrederik Gladhorn2014-08-202-0/+1
| | | | | | | QtWayland is going to be released with Qt 5.4. Change-Id: I9a9bead92c6c34324510007ad844c9fdf633690d Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* 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>
* init-repository: Support submodules more than one dir deepJocelyn Turcotte2014-08-151-2/+4
| | | | | Change-Id: I8783ded72032dda42bc24a855e190e0a2e699b01 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>