lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-01-26 08:26:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
884 Commits 118 Branches 269 Tags
ed6175da93a16e2733c2dcc266761ba91f225ada
Commit Graph

884 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
5fd794ca6d Updated submodules. 
Change-Id: Ic8d3a71d7cf7e92224064aa989a9551ee52c9d57
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-01-17 09:37:44 +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
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
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
Qt Submodule Update Bot
234dcbfcba Updated submodules. 
Change-Id: Ib742f171c913b182d699270890599e3628d5df10
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-05 13:05:12 +01:00
Qt Submodule Update Bot
b742f171c9 Updated submodules. 
Change-Id: Ibabbfd7ae348a5b96999eb09820c1abe7094bcf6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-04 21:57:31 +01:00
Qt Submodule Update Bot
babbfd7ae3 Updated submodules. 
Change-Id: I5987a236d059243d05d411cdc9f0193448a006ab
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-04 08:13:47 +01:00
Frederik Gladhorn
cf08b0d109 Add qtenginio as submodule 
Change-Id: Ida65ce0162fa65c37413ce6716eb6382e1593338
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-11-01 13:38:03 +01:00
Qt Submodule Update Bot
5987a236d0 Updated submodules. 
Change-Id: I08e6aa58fbddc3b18407593ef1fd6886b20370a0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-11-01 07:32:42 +01:00
Qt Submodule Update Bot
08e6aa58fb Updated submodules. 
Change-Id: I8b4022260b5b1d1016979086d0fe7eeba44f8883
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-10-31 20:00:22 +01:00
Qt Submodule Update Bot
8b4022260b Updated submodules. 
Change-Id: Ic1160960655acf260a4ab47d9caea3b271a09bf6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2013-10-31 11:03:11 +01:00
Allan Sandfeld Jensen
758d922716 Refine qt-module dependencies for massively parallel builds 
QtWebKit should be build after QtMultimedia for multimedia support on Mac
and Windows.

QtScript should be build after QtTools because an example uses UiTools.

Change-Id: Id92efac72d8c2c2237f21fad1ab823c1c1ac95dd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-10-24 18:48:58 +02:00
Qt Submodule Update Bot
c116096065 Updated submodules. 
Change-Id: I7e2e8cad6636584f1d3fc9d213363e5fc6243ef2
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
v5.2.0-beta1 		2013-10-22 05:27:19 +02:00
Qt Submodule Update Bot
7e2e8cad66 Updated submodules. 
Change-Id: Icb2d850b479fed9fed3c4a9fea698f924be942ef
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-10-16 18:38:03 +02:00
Sergio Ahumada
4c925babf9 Merge "Merge branch 'stable' into dev" into refs/staging/dev 2013-10-16 12:39:27 +02:00
Qt Submodule Update Bot
cb2d850b47 Updated submodules. 
Change-Id: If9a5d1941655bd5cceaa7ded5893fea3206c5bea
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-10-15 21:01:19 +02:00
Qt Submodule Update Bot
d000023376 Updated submodules. 
Change-Id: I1aa3ccbc4c789fb0ef265f88c9062b8bc591c449
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-10-15 20:33:49 +02:00
Sergio Ahumada
38b7c75f6b Merge branch 'stable' into dev 
Change-Id: I25b06e3ed27caab7b80c4e47a7e836559397c3c8
 2013-10-15 12:13:50 +02:00
Qt Submodule Update Bot
1aa3ccbc4c Updated submodules. 
Change-Id: I270009dfde0be0080902b6ea6a220ccf4095cb0e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-10-14 17:52:01 +02:00
Qt Submodule Update Bot
f9a5d19416 Updated submodules. 
Change-Id: I7f523a7aa3a00d2190cbe7ca4c52a9a30cb67ea0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2013-10-12 23:23:49 +02:00
Mandeep Sandhu
728cd2e173 Ignore auto-generated file .qmake.super 
Added rule in .gitignore for .qmake.super.
This file is generated when building Qt from the root dir.

Task-number: QTBUG-33439
Change-Id: Ic15b10e9c7cb175f2ff102f75d08110acf13a0cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-10-08 15:45:02 +02:00
Oswald Buddenhagen
f09783bb80 move changelog entry before the real footers 
the change-id will be added at the end, which will look just plain
stupid if the other "real" footers come above the changelog.
also, a smart log author would integrate the changelog entry into the
flow of the message, so further up in the template is more natural.

Change-Id: I053840a81ea62f2e0ad1bd133f2e7a2692a6f2d6
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 2013-10-08 15:44:55 +02:00