aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.4.2' into 5.45.4Oswald Buddenhagen2015-08-140-0/+0
|\ | | | | | | Change-Id: Id8fa6d30810f8bfe46d5aa7e279c69ea560edd19
| * Merge branch '5.4' into 5.4.2v5.4.2Oswald Buddenhagen2015-05-293-7/+7
| |\ | | | | | | | | | Change-Id: I33d967b5f668c672a55ad93ac314340453850521
| * | Updated submodules.Qt Submodule Update Bot2015-05-291-0/+0
| | | | | | | | | | | | | | | Change-Id: I670466b6a3ff58edb40c91ff86c443cd6dd20126 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | Updated submodules.Qt Submodule Update Bot2015-05-283-0/+0
| | | | | | | | | | | | | | | Change-Id: I07856d73e19b60fbc01ff650cddb1d557db35617 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Updated submodules.Qt Submodule Update Bot2015-05-234-0/+0
| | | | | | | | | | | | | | | Change-Id: Idfffbfdc266be3f52f716b152bbcb70810127cc9 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | Updated submodules.Qt Submodule Update Bot2015-05-162-0/+0
| | | | | | | | | | | | | | | Change-Id: I24f1b3219d1db41acc3f0781fa38f253bcb04da3 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | Updated submodules.Qt Submodule Update Bot2015-05-132-0/+0
| | | | | | | | | | | | | | | Change-Id: If7cb995d04fdc05b35df8b6c5215bf530006b984 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Updated submodules.Qt Submodule Update Bot2015-05-093-0/+0
| | | | | | | | | | | | | | | Change-Id: I11963ba9f0141fc72dadedffe2c36fba5be16186 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | Updated submodules.Qt Submodule Update Bot2015-05-031-0/+0
| | | | | | | | | | | | | | | Change-Id: I39ce0228dad0d141df17ea5f911046130f823467 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | Updated submodules.Qt Submodule Update Bot2015-04-2814-0/+0
| | | | | | | | | | | | | | | Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | Adjust submodule branchesOswald Buddenhagen2015-04-101-29/+29
| | | | | | | | | | | | Change-Id: Ib30d8a8c4691787c460fe6540b64e2d593422c68
* | | Updated submodules.Qt Submodule Update Bot2015-06-194-0/+0
| | | | | | | | | | | | | | | Change-Id: I00defc7101f1cabc0cc540a84846ec9b7933f599 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | Updated submodules.Qt Submodule Update Bot2015-05-3114-0/+0
| |/ |/| | | | | | | Change-Id: Ib62714f88c3cd381cbbf8758c7b1029c2fa254ed Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Merge tag 'v5.4.1' into 5.4Oswald Buddenhagen2015-05-290-0/+0
|\ \ | | | | | | | | | Qt 5.4.1 Release
| * | Updated submodules.v5.4.1Qt Submodule Update Bot2015-02-163-0/+0
| | | | | | | | | | | | | | | Change-Id: I0badf6179237bb89ffc57c7387cbf21ebc3b6665 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | Updated submodules.Qt Submodule Update Bot2015-02-144-0/+0
| | | | | | | | | | | | | | | Change-Id: I98737b388b9898507bebcd8d05a86e7d916b6d25 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | Updated submodules.Qt Submodule Update Bot2015-02-133-0/+0
| | | | | | | | | | | | | | | Change-Id: I9fb1a2e12fb6562c22dbac5fbca06d33046a5030 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | Updated submodules.Qt Submodule Update Bot2015-02-102-0/+0
| | | | | | | | | | | | | | | Change-Id: Ib71478c424ed0a6fd8d058513aa9a68dda71336f Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | Updated submodules.Qt Submodule Update Bot2015-02-065-0/+0
| | | | | | | | | | | | | | | Change-Id: I81efb6de3c49e6779556b1d1dfe06f1e1bc574f6 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | Updated submodules.Qt Submodule Update Bot2015-02-0312-0/+0
| | | | | | | | | | | | | | | Change-Id: Ief1f126ddc66293b041fe5658d57056761eefe05 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | Updated submodules.Qt Submodule Update Bot2015-01-2923-0/+0
| | | | | | | | | | | | | | | Change-Id: I0163cb617aa19a26423a716bef23bfc6308aadc6 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | Adjust submodule branchesOswald Buddenhagen2015-01-081-29/+29
| | | | | | | | | | | | Change-Id: I6f2358370d81238f462d26388d85aa5f74a8b455
* | | Merge tag 'v5.4.0' into 5.4Oswald Buddenhagen2015-05-290-0/+0
|\ \ \ | | | | | | | | | | | | Qt 5.4.0 Release
| * | | Updated submodules.v5.4.0Qt Submodule Update Bot2014-12-055-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I1998742ceac59b50864ccec46a6c2f255871ab30 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | | Updated submodules.Qt Submodule Update Bot2014-12-0412-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib1885ea72539f3bd2df4d4131f0b164b02d4b59f Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | | Updated submodules.Qt Submodule Update Bot2014-11-275-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I338ee26271c05b612fc58381270ca471db12aaef Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | | | Updated submodules.Qt Submodule Update Bot2015-05-1431-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I68b5c48282234a27f7c96595c8d84a4dc0bb3871 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | | Replace old qt-project.org wiki with wiki.qt.ioSergio Ahumada2015-04-163-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9a1114a8b5da649d3da718248fe5df5781810c20 Reviewed-by: Tero Kojo <tero.kojo@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | | | Updated submodules.Qt Submodule Update Bot2015-04-159-0/+0
| |_|/ |/| | | | | | | | | | | Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | | Updated submodules.Qt Submodule Update Bot2015-04-0925-0/+0
| | | | | | | | | | | | | | | Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | | use git clone --branch instead of --no-checkoutOswald Buddenhagen2015-03-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git submodule update does not cause an actual checkout if HEAD matches the recorded submodule sha1 even if it was not actually checked out. it would be possible to work around this by calling git checkout HEAD in each submodule if no files are checked out, but that seems hacky. instead, just make the module cloning already check out the desired branch. this produces checkouts that are within a few commits of the final sha1, so isn't too bad. Change-Id: I435c1a2e24f39fd8c0d65f0d90df0216715668b7
* | | Updated submodules.Qt Submodule Update Bot2015-02-1423-0/+0
| | | | | | | | | | | | | | | Change-Id: Idc93c0d4d7c8e30258fb3ad9f4735e4c9d07457c Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | | Updated submodules.Qt Submodule Update Bot2015-02-0631-0/+0
| | | | | | | | | | | | | | | Change-Id: I0163cb617aa19a26423a716bef23bfc6308aadc6 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | don't fetch again when updating submodulesOswald Buddenhagen2015-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we already did it a moment ago. this should affect only the --remote case, but there is no harm in always specifying it. Change-Id: I3ef0854c790726772fb63ab7829b59ef85ac4f18 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | don't checkout when cloningOswald Buddenhagen2015-02-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | we will subsequently do a submodule update with a possibly different sha1 anyway. Change-Id: I4950f3727e4263a73c32eff8460962d5796bc5f3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | make manual fetching saneOswald Buddenhagen2015-02-061-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is in no way said that the remote's HEAD will contain the commit to be checked out - in fact, it's pretty much guaranteed that it won't for anything but the default branch. fetching the whole remote avoids additional roundtrips and makes the --branch feature actually work reasonably. Change-Id: I20de2da848b12aea8c5b2784307fe9860252009b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | always check out the target branch when using --branchOswald Buddenhagen2015-02-061-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | a submodule update with --remote will use the tip of the remote's branch, but it won't actually switch to the branch if HEAD doesn't point to it yet. Change-Id: If13e31da2646683dfb9e832eaab929190acb0167 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | fix --branch without --no-updateOswald Buddenhagen2015-02-061-1/+3
| |/ |/| | | | | | | | | | | | | clearly, i botched the syntax, but i can't even tell how. that's perl. the new version is more readable anyway. Change-Id: Ic3e93c2cf30ee92f368808070899af4b9f7809a3 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | Updated submodules.Qt Submodule Update Bot2014-12-2319-0/+0
| | | | | | | | | | Change-Id: I9ca0c5251312fbb7b83264eff28ef98287c7f70d Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Updated submodules.Qt Submodule Update Bot2014-12-1530-0/+0
| | | | | | | | | | Change-Id: Ia68a6b964f770fef3ea3d52f29d0c7a86186e80c Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Updated submodules.Qt Submodule Update Bot2014-12-0216-0/+0
| | | | | | | | | | Change-Id: I968f8a2a5ef20c47184d15b8f9e92a795176fcb2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | adjust submodule branch names for 5.4 branchOswald Buddenhagen2014-12-021-29/+29
| | | | | | | | | | | | Change-Id: I1621fee44becf1940d7d50a604fa8c91f3be78d9 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4.0' into 5.4Oswald Buddenhagen2014-11-252-7/+67
|\| | | | | | | Change-Id: I5b2910fc4e8fece8fad42eb200ed6dffdd24f751
| * Updated submodules.Qt Submodule Update Bot2014-11-257-0/+0
| | | | | | | | | | Change-Id: I77f387bc89c06d870b7d41516734ee3f1c68e71a Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * 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>