lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-06 20:35:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,023 Commits 120 Branches 272 Tags
5.4
Commit Graph

1023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oswald Buddenhagen
3f2ff8b460 Merge remote-tracking branch 'origin/5.4.2' into 5.4 
Change-Id: Id8fa6d30810f8bfe46d5aa7e279c69ea560edd19
 2015-08-14 13:34:32 +02:00
Qt Submodule Update Bot
0d60d720f8 Updated submodules. 
Change-Id: I00defc7101f1cabc0cc540a84846ec9b7933f599
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-19 18:49:53 +00:00
Qt Submodule Update Bot
00defc7101 Updated submodules. 
Change-Id: Ib62714f88c3cd381cbbf8758c7b1029c2fa254ed
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-05-31 06:58:29 +00:00
Oswald Buddenhagen
4a5968ce75 Merge branch '5.4' into 5.4.2 
Change-Id: I33d967b5f668c672a55ad93ac314340453850521
v5.4.2 		2015-05-29 20:12:13 +02:00
Oswald Buddenhagen
843a3407f2 Merge tag 'v5.4.1' into 5.4 
Qt 5.4.1 Release
 2015-05-29 15:53:05 +02:00
Oswald Buddenhagen
5400507252 Merge tag 'v5.4.0' into 5.4 
Qt 5.4.0 Release
 2015-05-29 15:52:28 +02:00
Qt Submodule Update Bot
210493d641 Updated submodules. 
Change-Id: I670466b6a3ff58edb40c91ff86c443cd6dd20126
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-05-29 09:18:21 +00:00
Qt Submodule Update Bot
670466b6a3 Updated submodules. 
Change-Id: I07856d73e19b60fbc01ff650cddb1d557db35617
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-05-28 11:33:18 +00:00
Qt Submodule Update Bot
07856d73e1 Updated submodules. 
Change-Id: Idfffbfdc266be3f52f716b152bbcb70810127cc9
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-05-23 06:51:36 +00:00
Qt Submodule Update Bot
dfffbfdc26 Updated submodules. 
Change-Id: I24f1b3219d1db41acc3f0781fa38f253bcb04da3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-05-16 04:57:35 +00:00
Qt Submodule Update Bot
b62714f88c Updated submodules. 
Change-Id: I68b5c48282234a27f7c96595c8d84a4dc0bb3871
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-05-14 14:37:56 +00:00
Qt Submodule Update Bot
24f1b3219d Updated submodules. 
Change-Id: If7cb995d04fdc05b35df8b6c5215bf530006b984
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-05-13 15:55:59 +00:00
Qt Submodule Update Bot
f7cb995d04 Updated submodules. 
Change-Id: I11963ba9f0141fc72dadedffe2c36fba5be16186
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-05-09 12:22:09 +00:00
Qt Submodule Update Bot
11963ba9f0 Updated submodules. 
Change-Id: I39ce0228dad0d141df17ea5f911046130f823467
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-05-03 07:57:31 +00:00
Qt Submodule Update Bot
39ce0228da Updated submodules. 
Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-04-28 10:58:28 +00:00
Sergio Ahumada
95bb29e243 Replace old qt-project.org wiki with wiki.qt.io 
Change-Id: I9a1114a8b5da649d3da718248fe5df5781810c20
Reviewed-by: Tero Kojo <tero.kojo@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-04-16 09:42:01 +00:00
Qt Submodule Update Bot
68b5c48282 Updated submodules. 
Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-04-15 09:16:10 +00:00
Oswald Buddenhagen
451f0a193b Adjust submodule branches 
Change-Id: Ib30d8a8c4691787c460fe6540b64e2d593422c68
 2015-04-10 12:10:34 +02:00
Qt Submodule Update Bot
59e3021a52 Updated submodules. 
Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-04-09 09:28:44 +00:00
Oswald Buddenhagen
ac6168c0cb use git clone --branch instead of --no-checkout 
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
 2015-03-04 12:23:13 +01:00
Qt Submodule Update Bot
e3cd5bb368 Updated submodules. 
Change-Id: I0badf6179237bb89ffc57c7387cbf21ebc3b6665
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
v5.4.1 		2015-02-16 19:57:25 +00:00
Qt Submodule Update Bot
be35b9f9af Updated submodules. 
Change-Id: Idc93c0d4d7c8e30258fb3ad9f4735e4c9d07457c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-02-14 11:18:41 +00:00
Qt Submodule Update Bot
0badf61792 Updated submodules. 
Change-Id: I98737b388b9898507bebcd8d05a86e7d916b6d25
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-02-14 08:54:49 +00:00
Qt Submodule Update Bot
98737b388b Updated submodules. 
Change-Id: I9fb1a2e12fb6562c22dbac5fbca06d33046a5030
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-02-13 04:29:58 +00:00
Qt Submodule Update Bot
9fb1a2e12f Updated submodules. 
Change-Id: Ib71478c424ed0a6fd8d058513aa9a68dda71336f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-02-10 09:18:23 +00:00
Qt Submodule Update Bot
b71478c424 Updated submodules. 
Change-Id: I81efb6de3c49e6779556b1d1dfe06f1e1bc574f6
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-02-06 17:00:48 +00:00
Qt Submodule Update Bot
dc93c0d4d7 Updated submodules. 
Change-Id: I0163cb617aa19a26423a716bef23bfc6308aadc6
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2015-02-06 06:24:23 +00:00
Oswald Buddenhagen
34c7caab3f don't fetch again when updating submodules 
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>
 2015-02-06 06:24:10 +00:00
Oswald Buddenhagen
9ebad7830d don't checkout when cloning 
we will subsequently do a submodule update with a possibly different
sha1 anyway.

Change-Id: I4950f3727e4263a73c32eff8460962d5796bc5f3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2015-02-06 06:24:06 +00:00
Oswald Buddenhagen
1ad0a17fa0 make manual fetching sane 
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>
 2015-02-06 06:24:03 +00:00
Oswald Buddenhagen
d553fc4fa9 always check out the target branch when using --branch 
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>
 2015-02-06 06:23:59 +00:00
Oswald Buddenhagen
b236ef6aef fix --branch without --no-update 
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>
 2015-02-06 06:23:54 +00:00
Qt Submodule Update Bot
81efb6de3c Updated submodules. 
Change-Id: Ief1f126ddc66293b041fe5658d57056761eefe05
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-02-03 11:14:37 +00:00
Qt Submodule Update Bot
ef1f126ddc Updated submodules. 
Change-Id: I0163cb617aa19a26423a716bef23bfc6308aadc6
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-01-29 04:28:53 +00:00
Oswald Buddenhagen
c3a6185b7e Adjust submodule branches 
Change-Id: I6f2358370d81238f462d26388d85aa5f74a8b455
 2015-01-08 12:53:09 +01:00
Qt Submodule Update Bot
0163cb617a Updated submodules. 
Change-Id: I9ca0c5251312fbb7b83264eff28ef98287c7f70d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2014-12-23 11:41:25 +01:00
Qt Submodule Update Bot
9ca0c52513 Updated submodules. 
Change-Id: Ia68a6b964f770fef3ea3d52f29d0c7a86186e80c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2014-12-15 08:29:57 +01:00
Qt Submodule Update Bot
3439140073 Updated submodules. 
Change-Id: I1998742ceac59b50864ccec46a6c2f255871ab30
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
v5.4.0 		2014-12-05 10:51:00 +01:00
Qt Submodule Update Bot
1998742cea Updated submodules. 
Change-Id: Ib1885ea72539f3bd2df4d4131f0b164b02d4b59f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2014-12-04 13:50:13 +01:00
Qt Submodule Update Bot
a68a6b964f Updated submodules. 
Change-Id: I968f8a2a5ef20c47184d15b8f9e92a795176fcb2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
 2014-12-02 12:15:22 +01:00
Oswald Buddenhagen
663f814c24 adjust submodule branch names for 5.4 branch 
Change-Id: I1621fee44becf1940d7d50a604fa8c91f3be78d9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
 2014-12-02 12:15:15 +01:00
Qt Submodule Update Bot
b1885ea725 Updated submodules. 
Change-Id: I338ee26271c05b612fc58381270ca471db12aaef
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2014-11-27 06:41:45 +01:00
Oswald Buddenhagen
6040cb2ff5 Merge remote-tracking branch 'origin/5.4.0' into 5.4 
Change-Id: I5b2910fc4e8fece8fad42eb200ed6dffdd24f751
 2014-11-25 18:00:25 +01:00
Qt Submodule Update Bot
338ee26271 Updated submodules. 
Change-Id: I77f387bc89c06d870b7d41516734ee3f1c68e71a
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2014-11-25 05:39:27 +01:00
Qt Submodule Update Bot
77f387bc89 Updated submodules. 
Change-Id: I7c0bc2305680fac216bbaa72ac83f65b04feffff
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
v5.4.0-rc1 		2014-11-21 09:26:31 +01:00
Qt Submodule Update Bot
968f8a2a5e Updated submodules. 
Change-Id: Icafd720586cfe92d6e5773d553f6e70594f6c7dc
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2014-11-20 09:02:53 +01:00
Qt Submodule Update Bot
7c0bc23056 Updated submodules. 
Change-Id: I4b199501287c5a5961405ae0667c04dc1188af44
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2014-11-20 07:00:26 +01:00
Qt Submodule Update Bot
4b19950128 Updated submodules. 
Change-Id: I96d903eec0ee9d2fd76e1e3f1ebfd868ad937dbe
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2014-11-19 05:46:17 +01:00
Qt Submodule Update Bot
96d903eec0 Updated submodules. 
Change-Id: Ie8053418e43127327f6df892ae774a1707a9ae97
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2014-11-12 22:35:27 +01:00
Oswald Buddenhagen
38cfc8ec95 don't fetch unless we are updating 
it's just wasting time.

Change-Id: I541cc535c5c95b0140cfa14d7cb042dbe029525e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
 2014-11-12 10:49:16 +01:00