lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-19 03:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
976 Commits 120 Branches 274 Tags
95817eeedab667ab8616e9d29837b9cbd6e00a87
Commit Graph

976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
ae9c68d190 Updated submodules. 
Change-Id: I3b525e1235e9ec27db475fac6086a884297d1634
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-02-10 14:03:43 +01:00
Friedemann Kleint
ef51fe0ebb Merge "Merge branch 'stable' into dev" into refs/staging/dev 2014-02-06 08:46:01 +01:00
Qt Submodule Update Bot
3b525e1235 Updated submodules. 
Change-Id: If37564a74908846d69141b95c7edd938f4fc2379
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-02-05 12:46:41 +01:00
Qt Submodule Update Bot
17e103bb5d Updated submodules. 
Change-Id: Icbb3e6068e906ca3cc08056833895a615bcad01b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
v5.2.1 		2014-01-30 12:36:50 +01:00
Frederik Gladhorn
76e16b228e Merge branch 'stable' into dev 
Conflicts:
	qtactiveqt
	qtandroidextras
	qtbase
	qtconnectivity
	qtdeclarative
	qtdoc
	qtgraphicaleffects
	qtimageformats
	qtlocation
	qtmacextras
	qtmultimedia
	qtqa
	qtquick1
	qtquickcontrols
	qtrepotools
	qtscript
	qtsensors
	qtserialport
	qtsvg
	qttools
	qttranslations
	qtwebkit
	qtwebkit-examples
	qtwinextras
	qtx11extras
	qtxmlpatterns

Change-Id: I404135b8463e4cdfc6a235f8c2203ea8ddfa3df5
 2014-01-29 13:52:49 +01:00
Qt Submodule Update Bot
cbb3e6068e Updated submodules. 
Change-Id: Ia4f6e14fc205dfcf15a8df7f275a1cfefdc41c1a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-01-28 13:50:13 +01:00
Qt Submodule Update Bot
a4f6e14fc2 Updated submodules. 
Change-Id: Ie259fdadce42cfe9e740f99e5b3d4a39473b775c
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-01-27 12:43:12 +01:00
Qt Submodule Update Bot
e259fdadce Updated submodules. 
Change-Id: I44e7f5d2e3896dde44822517e0b51f62922645f0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-01-26 13:05:04 +01:00
Qt Submodule Update Bot
44e7f5d2e3 Updated submodules. 
Change-Id: I9710c4f2d2a79e0cdc6af17569914b9f3fa96aa4
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-01-25 17:45:45 +01:00
Qt Submodule Update Bot
9710c4f2d2 Updated submodules. 
Change-Id: I1d94d5ec03ccdf4272c6d4bd3e0eefd282464896
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-01-23 07:47:10 +01:00
Oswald Buddenhagen
604f330cd2 don't unnecessarily confuse qt creator 
our CONFIG+=build_pass hack has the side effect that qmake does not emit
the calling command line to the makefile, which makes creator unable to
detect the build. so revert the hack as soon as it did its deed.

Task-number: QTBUG-34788
Change-Id: I4c0fd28d661ca5049f31d5405e84525efb12fd4e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-01-23 07:18:25 +01:00
Qt Submodule Update Bot
1d94d5ec03 Updated submodules. 
Change-Id: I7f329372759e1ea21f5812df08b5eb218d09079e
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-01-21 20:12:33 +01:00
Qt Submodule Update Bot
b25883ebaa Updated submodules. 
Change-Id: Ia968d5d5314ac04835e90be462b1a71f8ab293e9
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
 2014-01-20 18:37:41 +01:00
Qt Submodule Update Bot
a968d5d531 Updated submodules. 
Change-Id: I5fd794ca6d89ea5787cb1b7d2dcabc6f7b75776a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-01-20 12:43:47 +01:00
Qt Submodule Update Bot
7f32937275 Updated submodules. 
Change-Id: If92227236c0b68580bd936c5f9a8cc5ca1f714e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-01-19 17:42:41 +01:00
Qt Submodule Update Bot
f92227236c Updated submodules. 
Change-Id: Ic8d3a71d7cf7e92224064aa989a9551ee52c9d57
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-01-17 20:34:05 +01:00
Qt Submodule Update Bot
5fd794ca6d Updated submodules. 
Change-Id: Ic8d3a71d7cf7e92224064aa989a9551ee52c9d57
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-01-17 09:37:44 +01:00
Oswald Buddenhagen
563b32ee25 Merge remote-tracking branch 'gerrit/stable' into release 
Conflicts:
	qtwebkit-examples

Change-Id: Ifa8735dd8f7ddf3aa74474c983327b94ea2737c5
 2014-01-16 14:31:57 +01:00
Alex Blasche
4b256e249b Add QtAndroidExtras to dependency list of QtConnectivity 
We only need it for Android builds though.

Change-Id: I760dfd6038da2d4061326dd361ac517c9e674239
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-01-14 14:19:38 +01:00
Qt Submodule Update Bot
f37564a749 Updated submodules. 
Change-Id: Ibaac9b5129cd252d65ce5896bac05e96abe6859c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2014-01-11 11:59:15 +01:00
Qt Submodule Update Bot
c8d3a71d7c Updated submodules. 
Change-Id: I402457bcfbad53c6dd2214290c668ece693bbdcd
Reviewed-by: Matti Paaso <matti.paaso@digia.com>
 2014-01-10 08:49:02 +01:00
Qt Submodule Update Bot
402457bcfb Updated submodules. 
Change-Id: I06d0fa240f6a0f99770e51969543608dbaf5f7e0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2014-01-09 18:00:53 +01:00
Qt Submodule Update Bot
baac9b5129 Updated submodules. 
Change-Id: If7b7ff4f9fdd710ef78a953113e87393597e3e80
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2014-01-09 07:52:59 +01:00
Qt Submodule Update Bot
06d0fa240f Updated submodules. 
Change-Id: Ia250914fecb288f82db6a7b53e70d433898eb2f4
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-01-02 08:10:02 +01:00
Qt Submodule Update Bot
a250914fec Updated submodules. 
Change-Id: Iec0c8697aa573d7bdec000ab2e6fb0729c0793bc
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-12-20 06:41:46 +01:00
Qt Submodule Update Bot
f7b7ff4f9f Updated submodules. 
Change-Id: Id00002337613fa6681aed81193565ed7a5a4e472
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
 2013-12-16 12:41:55 +01:00
Qt Submodule Update Bot
ec0c8697aa Updated submodules. 
Change-Id: I7c73e564bd61faa38fdd51947f8d98c03230f104
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-12-16 11:26:06 +01:00
Qt Submodule Update Bot
02353a4b3e Updated submodules. 
Change-Id: Ib5594043bc3bcf735aedfaa1871de2c116bbe715
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
v5.2.0 		2013-12-08 11:14:18 +01:00
Qt Submodule Update Bot
b5594043bc Updated submodules. 
Change-Id: I323825a1dbd75c630644f3b11349c6c3fe6e2e29
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-12-06 07:13:17 +01:00
Qt Submodule Update Bot
323825a1db Updated submodules. 
Change-Id: Id8f6092efde7a94457986da66e9cd05243ba7e84
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-12-05 12:33:11 +01:00
Qt Submodule Update Bot
d8f6092efd Updated submodules. 
Change-Id: Ie2d566a72dcdf9cb8e7b8ec3f7050103d08f6261
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-12-04 14:29:05 +01:00
Qt Submodule Update Bot
e2d566a72d Updated submodules. 
Change-Id: I0ea66cab6e5d390492b80b61e33d9ad3f607e006
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
 2013-12-03 14:26:42 +01:00
Qt Submodule Update Bot
0ea66cab6e Updated submodules. 
Change-Id: I100c98b9fcbd54f001eed4b7cda91bb9e1fab531
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-12-01 15:12:03 +01:00
Qt Submodule Update Bot
100c98b9fc Updated submodules. 
Change-Id: I27f8dc93ae7917913c42e6e42f12bc706468fc54
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-30 21:19:09 +01:00
Oswald Buddenhagen
dbac1e77f7 try to make the ChangeLog template more inviting 
move it even futher up and encourage integrating it into the rest of the
commit message.

Change-Id: I5aaa417a58d420c3d3a8d5ca80dcd9f265c64829
Reviewed-by: Sergio Ahumada <sahumada@gmail.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 2013-11-30 15:24:54 +01:00
Qt Submodule Update Bot
27f8dc93ae Updated submodules. 
Change-Id: If62385a213d41b12483a95ac0769a82b66897529
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-30 10:27:04 +01:00
Qt Submodule Update Bot
f62385a213 Updated submodules. 
Change-Id: I948ce9ed9e12459be045ec3c1264b19822ba1494
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
v5.2.0-rc1 		2013-11-26 14:43:56 +01:00
Qt Submodule Update Bot
948ce9ed9e Updated submodules. 
Change-Id: I284765a1be816913b0d126e863583759adb160b3
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
 2013-11-25 19:49:39 +01:00
Qt Submodule Update Bot
284765a1be Updated submodules. 
Change-Id: Ieda3b9c308665e0379cfa5fa0e1bc65d8208ec64
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
 2013-11-24 21:59:51 +01:00
Qt Submodule Update Bot
eda3b9c308 Updated submodules. 
Change-Id: If3f634ae660e77effac660bc624b9a6f986cc398
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-11-22 21:02:25 +01:00
Qt Submodule Update Bot
f3f634ae66 Updated submodules. 
Change-Id: Ifbb4041031123eeb5a834c4f465d5e45d73ec9da
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-22 11:42:53 +01:00
Qt Submodule Update Bot
fbb4041031 Updated submodules. 
Change-Id: Ib7081d3f13d00144b11a56271eb39eb5e480c90b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-20 21:00:30 +01:00
Qt Submodule Update Bot
b7081d3f13 Updated submodules. 
Change-Id: I52a93121007cf19def97b313e34a87ecf5d73c09
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-20 14:04:14 +01:00
Qt Submodule Update Bot
52a9312100 Updated submodules. 
Change-Id: Ifc6f18a589d54f4dc7a4f75131e61e29b8e8cb31
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-19 16:50:54 +01:00
Qt Submodule Update Bot
fc6f18a589 Updated submodules. 
Change-Id: I83768ab76810afa1533e18d4f0e4c1ed56d2fbd5
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
 2013-11-19 07:16:15 +01:00
Qt Submodule Update Bot
83768ab768 Updated submodules. 
Change-Id: Ie137a789a90bbf3568404ff53d06d536319685d6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-14 18:07:58 +01:00
Qt Submodule Update Bot
e137a789a9 Updated submodules. 
Change-Id: I7c73e564bd61faa38fdd51947f8d98c03230f104
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-13 11:36:43 +01:00
Oswald Buddenhagen
0533da6bc1 Merge branch 'stable' into release 
this is done with -s ours, throwing away the sha1 updates in this
branch.
 2013-11-11 16:29:21 +01:00
Qt Submodule Update Bot
7c73e564bd Updated submodules. 
Change-Id: I749bc264b23ead54af325301479320766afce090
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-10 17:10:04 +01:00
Qt Submodule Update Bot
749bc264b2 Updated submodules. 
Change-Id: I234dcbfcba1e934b05ed0da921f69700ca480ddf
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-06 12:19:01 +01:00