aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated submodules.v5.3.0-beta1Qt Submodule Update Bot2014-03-228-0/+0
| | | | | Change-Id: Ib065abc7fd89c5766c5a060b295ea19154c02f64 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Add qtenginio#stable as part of the default modulesSergio Ahumada2014-03-212-0/+1
| | | | | | | Also update qtenginio to the latest stable sha1. Change-Id: Ia60a65c1a66a1b157240cc7ef519dc0c20d36567 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-03-219-0/+0
| | | | | Change-Id: Ie045c5319823add1aeca81b2ca44ce913cac4f74 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-03-1914-0/+0
| | | | | Change-Id: I6d47ef2b92d142bd2777a8c0d2abc4c758fbcb8b Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-03-1811-0/+0
| | | | | Change-Id: I74af16bd0da5e2dc9e5b265d26e564201cc31b78 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-03-162-0/+0
| | | | | Change-Id: I556a3377ffb8348cdc2301b45c445c2f244ccf6a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-03-1516-0/+0
| | | | | Change-Id: I8ce1937883833b7e66453e3764e390d0dc44b925 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-03-106-0/+0
| | | | | Change-Id: Ie198c124d3259dea657fcfa4c9b9b43bcd2d9fd0 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-03-077-0/+0
| | | | | Change-Id: I7704ce065db8050837d8bf97f8f4c1798b6d92fb Reviewed-by: Antti Kokko <antti.kokko@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-03-067-0/+0
| | | | | Change-Id: I592415857ca8c6cbd2854dd9de0a573f29842161 Reviewed-by: Antti Kokko <antti.kokko@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-03-0514-0/+0
| | | | | Change-Id: Ie169f588d85737831df044e2661484cb734b19eb Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* Updated submodules.Qt Submodule Update Bot2014-03-0415-0/+0
| | | | | Change-Id: I6380ce86f1f835ca6d6398fef301fbfb9748137a Reviewed-by: Antti Kokko <antti.kokko@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-03-0312-0/+0
| | | | | Change-Id: Ied6175da93a16e2733c2dcc266761ba91f225ada Reviewed-by: Antti Kokko <antti.kokko@digia.com>
* automatically install hooksOswald Buddenhagen2014-02-281-1/+43
| | | | | | Change-Id: I2fabc610dd69730cfdac45046d4bbc6f53822fc4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-02-2811-0/+0
| | | | | Change-Id: I63200543dde700d6b0fd343800793adb6e180bad Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Updated submodules.v5.3.0-alpha1Qt Submodule Update Bot2014-02-2615-0/+0
| | | | Change-Id: I0a23321599c73357c6f724f204b480ba7311e51a
* nuke qlalr submoduleOswald Buddenhagen2014-02-224-5/+0
| | | | | | | | it was merged back into qtbase. Change-Id: Ia5e6252ac13b0f821807c825eea611d484c1dd7b Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-02-2127-0/+0
| | | | | Change-Id: Idc199e37d59beb8a4801a599dd5a0ff9ee2c23f8 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* remove reviewed-by templateOswald Buddenhagen2014-02-201-3/+0
| | | | | | | | 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
* Merge remote-tracking branch 'gerrit/dev' into stableOswald Buddenhagen2014-02-194-1/+10
|\ | | | | | | Change-Id: I7e15ecc9ce71063757677e5c8b07e3c0167c857c
| * Add qtwebsockets as submoduleFrederik Gladhorn2014-02-174-0/+6
| | | | | | | | | | | | | | | | | | | | | | 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>
| * Updated submodules.Qt Submodule Update Bot2014-02-1518-0/+0
| | | | | | | | | | Change-Id: Iae9c68d190f22ef0e32546c7a3f513e9175ef3fc Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * Updated submodules.Qt Submodule Update Bot2014-02-1014-0/+0
| | | | | | | | | | Change-Id: I3b525e1235e9ec27db475fac6086a884297d1634 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * Merge "Merge branch 'stable' into dev" into refs/staging/devFriedemann Kleint2014-02-065-6/+13
| |\
| | * Merge branch 'stable' into devFrederik Gladhorn2014-01-295-6/+13
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Updated submodules.Qt Submodule Update Bot2014-02-0529-0/+0
| |/ / | | | | | | | | | | | | Change-Id: If37564a74908846d69141b95c7edd938f4fc2379 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * | Add QtAndroidExtras to dependency list of QtConnectivityAlex Blasche2014-01-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Updated submodules.Qt Submodule Update Bot2014-01-1116-0/+0
| | | | | | | | | | | | | | | Change-Id: Ibaac9b5129cd252d65ce5896bac05e96abe6859c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | Updated submodules.Qt Submodule Update Bot2014-01-0922-0/+0
| | | | | | | | | | | | | | | Change-Id: If7b7ff4f9fdd710ef78a953113e87393597e3e80 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | Updated submodules.Qt Submodule Update Bot2013-12-1631-0/+0
| | | | | | | | | | | | | | | Change-Id: Id00002337613fa6681aed81193565ed7a5a4e472 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| * | Merge "Merge branch 'stable' into dev" into refs/staging/devSergio Ahumada2013-10-166-5/+13
| |\ \
| | * \ Merge branch 'stable' into devSergio Ahumada2013-10-156-5/+13
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I25b06e3ed27caab7b80c4e47a7e836559397c3c8
| * | | | Updated submodules.Qt Submodule Update Bot2013-10-158-0/+0
| |/ / / | | | | | | | | | | | | | | | | Change-Id: I1aa3ccbc4c789fb0ef265f88c9062b8bc591c449 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | | Updated submodules.Qt Submodule Update Bot2013-10-1428-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I270009dfde0be0080902b6ea6a220ccf4095cb0e Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | | Updated submodules.Qt Submodule Update Bot2014-02-174-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ife236cc44c61eab39bec31a5ac9c0647934b03af Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | | | Updated submodules.Qt Submodule Update Bot2014-02-161-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I7befa702530b486531fbbc2ef7ed4d3195e2ad54 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | | | Updated submodules.Qt Submodule Update Bot2014-02-155-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I805c735b027c237245a0083a1d827bb9f64c21ce Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | | | Updated submodules.Qt Submodule Update Bot2014-02-1318-0/+0
| |_|/ |/| | | | | | | | | | | Change-Id: Ib25883ebaafe1b86077d77d5598355d1f9320a5a Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | | don't unnecessarily confuse qt creatorOswald Buddenhagen2014-01-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Updated submodules.Qt Submodule Update Bot2014-01-204-0/+0
| | | | | | | | | | | | | | | Change-Id: Ia968d5d5314ac04835e90be462b1a71f8ab293e9 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* | | Updated submodules.Qt Submodule Update Bot2014-01-206-0/+0
| | | | | | | | | | | | | | | Change-Id: I5fd794ca6d89ea5787cb1b7d2dcabc6f7b75776a Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | | Updated submodules.Qt Submodule Update Bot2014-01-1725-0/+0
| | | | | | | | | | | | | | | Change-Id: Ic8d3a71d7cf7e92224064aa989a9551ee52c9d57 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | | Updated submodules.Qt Submodule Update Bot2014-01-107-0/+0
| | | | | | | | | | | | | | | Change-Id: I402457bcfbad53c6dd2214290c668ece693bbdcd Reviewed-by: Matti Paaso <matti.paaso@digia.com>
* | | Updated submodules.Qt Submodule Update Bot2014-01-0911-0/+0
| | | | | | | | | | | | | | | Change-Id: I06d0fa240f6a0f99770e51969543608dbaf5f7e0 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | | Updated submodules.Qt Submodule Update Bot2014-01-0210-0/+0
| | | | | | | | | | | | | | | Change-Id: Ia250914fecb288f82db6a7b53e70d433898eb2f4 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | | Updated submodules.Qt Submodule Update Bot2013-12-208-0/+0
| | | | | | | | | | | | | | | Change-Id: Iec0c8697aa573d7bdec000ab2e6fb0729c0793bc Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | | Updated submodules.Qt Submodule Update Bot2013-12-1626-0/+0
| | | | | | | | | | | | | | | Change-Id: I7c73e564bd61faa38fdd51947f8d98c03230f104 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | | try to make the ChangeLog template more invitingOswald Buddenhagen2013-11-301-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Updated submodules.Qt Submodule Update Bot2013-11-1021-0/+0
| | | | | | | | | | | | | | | Change-Id: I749bc264b23ead54af325301479320766afce090 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | | Updated submodules.Qt Submodule Update Bot2013-11-066-0/+0
| | | | | | | | | | | | | | | Change-Id: I234dcbfcba1e934b05ed0da921f69700ca480ddf Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>