lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-17 09:46:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
961 Commits 120 Branches 272 Tags
500c2a725b71f95dc408d5593b746df5bf2a8013
Commit Graph

961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oswald Buddenhagen
500c2a725b Merge remote-tracking branch 'gerrit/stable' into release 2014-04-10 11:29:23 +02:00
Qt Submodule Update Bot
055e282245 Updated submodules. 
Change-Id: I56a5eee34a20e5de06ee8b430afa5c32ca6b94c6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-04-09 17:34:51 +02:00
Qt Submodule Update Bot
56a5eee34a Updated submodules. 
Change-Id: I2c0f1cfb71d44eed5fb4eaacc93d931e46df9512
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-04-04 21:01:59 +02:00
Qt Submodule Update Bot
2c0f1cfb71 Updated submodules. 
Change-Id: I4fadcf5d88abca2ae886dd4483ca2838bfdbce19
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-04-03 07:14:33 +02:00
Qt Submodule Update Bot
4fadcf5d88 Updated submodules. 
Change-Id: Ifb66951776e8decb8784c80fb7ed02864253065b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-04-01 19:29:23 +02:00
Qt Submodule Update Bot
fb66951776 Updated submodules. 
Change-Id: I55e55c405f6e950dcc623b1f7d7faa09bc8c950f
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
 2014-03-28 07:34:43 +01:00
Qt Submodule Update Bot
55e55c405f Updated submodules. 
Change-Id: I982ee75828244f44a1f27b4aa2d5a2a5dabbcd63
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
 2014-03-27 20:38:00 +01:00
Qt Submodule Update Bot
982ee75828 Updated submodules. 
Change-Id: I06d2b3a720c1aa819e35ddd51c6cd5211d2748a6
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
 2014-03-26 07:43:18 +01:00
Qt Submodule Update Bot
06d2b3a720 Updated submodules. 
Change-Id: Ib065abc7fd89c5766c5a060b295ea19154c02f64
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
v5.3.0-beta1 		2014-03-22 12:56:43 +01:00
Sergio Ahumada
67400663f8 Add qtenginio#stable as part of the default modules 
Also update qtenginio to the latest stable sha1.

Change-Id: Ia60a65c1a66a1b157240cc7ef519dc0c20d36567
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
 2014-03-21 13:16:20 +01:00
Qt Submodule Update Bot
b065abc7fd Updated submodules. 
Change-Id: Ie045c5319823add1aeca81b2ca44ce913cac4f74
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-03-21 13:16:16 +01:00
Qt Submodule Update Bot
e045c53198 Updated submodules. 
Change-Id: I6d47ef2b92d142bd2777a8c0d2abc4c758fbcb8b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-03-19 19:52:59 +01:00
Qt Submodule Update Bot
6d47ef2b92 Updated submodules. 
Change-Id: I74af16bd0da5e2dc9e5b265d26e564201cc31b78
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-03-18 05:42:39 +01:00
Qt Submodule Update Bot
74af16bd0d Updated submodules. 
Change-Id: I556a3377ffb8348cdc2301b45c445c2f244ccf6a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2014-03-16 13:12:02 +01:00
Qt Submodule Update Bot
556a3377ff Updated submodules. 
Change-Id: I8ce1937883833b7e66453e3764e390d0dc44b925
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-03-15 14:00:16 +01:00
Qt Submodule Update Bot
8ce1937883 Updated submodules. 
Change-Id: Ie198c124d3259dea657fcfa4c9b9b43bcd2d9fd0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-03-10 07:03:48 +01:00
Qt Submodule Update Bot
e198c124d3 Updated submodules. 
Change-Id: I7704ce065db8050837d8bf97f8f4c1798b6d92fb
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
 2014-03-07 20:37:07 +01:00
Qt Submodule Update Bot
7704ce065d Updated submodules. 
Change-Id: I592415857ca8c6cbd2854dd9de0a573f29842161
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
 2014-03-06 18:47:48 +01:00
Qt Submodule Update Bot
592415857c Updated submodules. 
Change-Id: Ie169f588d85737831df044e2661484cb734b19eb
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
 2014-03-05 18:36:01 +01:00
Qt Submodule Update Bot
e169f588d8 Updated submodules. 
Change-Id: I6380ce86f1f835ca6d6398fef301fbfb9748137a
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
 2014-03-04 11:28:56 +01:00
Qt Submodule Update Bot
6380ce86f1 Updated submodules. 
Change-Id: Ied6175da93a16e2733c2dcc266761ba91f225ada
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
 2014-03-03 14:50:47 +01:00
Oswald Buddenhagen
9372697001 automatically install hooks 
Change-Id: I2fabc610dd69730cfdac45046d4bbc6f53822fc4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2014-02-28 14:17:21 +01:00
Qt Submodule Update Bot
ed6175da93 Updated submodules. 
Change-Id: I63200543dde700d6b0fd343800793adb6e180bad
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-02-28 07:07:01 +01:00
Qt Submodule Update Bot
63200543dd Updated submodules. 
Change-Id: I0a23321599c73357c6f724f204b480ba7311e51a
v5.3.0-alpha1 		2014-02-26 07:33:29 +02:00
Oswald Buddenhagen
4e92039103 nuke qlalr submodule 
it was merged back into qtbase.

Change-Id: Ia5e6252ac13b0f821807c825eea611d484c1dd7b
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
 2014-02-22 18:22:38 +01:00
Qt Submodule Update Bot
0a23321599 Updated submodules. 
Change-Id: Idc199e37d59beb8a4801a599dd5a0ff9ee2c23f8
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-02-21 07:16:40 +01:00
Oswald Buddenhagen
6b22ad702d remove reviewed-by template 
unlike previously thought, gerrit does not remove recognized reviewers
who did not actually make a review. so better not suggest adding
potentially misleading footers.

Change-Id: I92d2833ca8888a2c2c09dfacb0cff122cad1eb15
 2014-02-20 12:21:07 +01:00
Oswald Buddenhagen
a3152cb8f1 Merge remote-tracking branch 'gerrit/dev' into stable 
Change-Id: I7e15ecc9ce71063757677e5c8b07e3c0167c857c
 2014-02-19 16:13:02 +01:00
Qt Submodule Update Bot
dc199e37d5 Updated submodules. 
Change-Id: Ife236cc44c61eab39bec31a5ac9c0647934b03af
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-02-17 20:44:41 +01:00
Oswald Buddenhagen
e1cd7c130b Merge remote-tracking branch 'origin/stable' into release 
Conflicts:
	qtxmlpatterns

Change-Id: Ida8491147bce712af45ab55cea7d9bd14ca9b9eb
 2014-02-17 11:21:58 +01:00
Frederik Gladhorn
a7dc6fd595 Add qtwebsockets as submodule 
This just adds the module, it doesn't yet make it part of Qt 5.3
or anything like that

Change-Id: Icd42c4d2366e31298758a6ef82924bfb64a9f814
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
 2014-02-17 06:32:17 +01:00
Qt Submodule Update Bot
fe236cc44c Updated submodules. 
Change-Id: I7befa702530b486531fbbc2ef7ed4d3195e2ad54
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-02-16 08:11:37 +01:00
Qt Submodule Update Bot
b2385231c4 Updated submodules. 
Change-Id: Iae9c68d190f22ef0e32546c7a3f513e9175ef3fc
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-02-15 17:13:03 +01:00
Qt Submodule Update Bot
7befa70253 Updated submodules. 
Change-Id: I805c735b027c237245a0083a1d827bb9f64c21ce
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-02-15 17:12:38 +01:00
Qt Submodule Update Bot
805c735b02 Updated submodules. 
Change-Id: Ib25883ebaafe1b86077d77d5598355d1f9320a5a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-02-13 10:31:05 +01:00
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