aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated submodules.Qt Submodule Update Bot2014-06-1724-0/+0
| | | | | Change-Id: If4479c349b595d28e0dd4985259d7d1ed00bb966 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* Updated submodules.Sergio Ahumada2014-06-0426-0/+0
| | | | | Change-Id: I000a16c22c4c3dc7d0e02aeb370454f386bb09f1 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-05-265-10/+45
|\ | | | | | | Change-Id: Ib1694808847f26576cc3c7780bd1c6d3689a8a26
| * Updated submodules.Qt Submodule Update Bot2014-05-259-0/+0
| | | | | | | | | | Change-Id: I620dc10e25cac7386182a6ff272b904f5f9f1a0d Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * Updated submodules.Qt Submodule Update Bot2014-05-2117-0/+0
| | | | | | | | | | Change-Id: I64f379141c59c193e3ebba5816495498c1ed0e64 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * don't claim that multimedia needs quickOswald Buddenhagen2014-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | it's a soft dependency and it appears to be properly checked in the subprojects. Task-number: QTBUG-38616 Change-Id: I5ada1f91247ba3668015e95d6da9c5996f1a138c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Updated submodules.Qt Submodule Update Bot2014-05-1314-0/+0
| | | | | | | | | | Change-Id: Ic9eb01ba38cca9c77a533f32d5f2f0519ec56aa3 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| * Updated submodules.Qt Submodule Update Bot2014-05-0415-0/+0
| | | | | | | | | | Change-Id: I25acd00fedc81040b0b108120b21deedafcf7fa4 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| * Updated submodules.Qt Submodule Update Bot2014-04-2628-0/+0
| | | | | | | | | | Change-Id: I055e2822456ad09cc939c628e4a86105eda5dade Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * Updated submodules.Qt Submodule Update Bot2014-04-0915-0/+0
| | | | | | | | | | Change-Id: I56a5eee34a20e5de06ee8b430afa5c32ca6b94c6 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * Updated submodules.Qt Submodule Update Bot2014-04-0412-0/+0
| | | | | | | | | | Change-Id: I2c0f1cfb71d44eed5fb4eaacc93d931e46df9512 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * Updated submodules.Qt Submodule Update Bot2014-04-0310-0/+0
| | | | | | | | | | Change-Id: I4fadcf5d88abca2ae886dd4483ca2838bfdbce19 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * Updated submodules.Qt Submodule Update Bot2014-04-0112-0/+0
| | | | | | | | | | Change-Id: Ifb66951776e8decb8784c80fb7ed02864253065b Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * Updated submodules.Qt Submodule Update Bot2014-03-286-0/+0
| | | | | | | | | | Change-Id: I55e55c405f6e950dcc623b1f7d7faa09bc8c950f Reviewed-by: Antti Kokko <antti.kokko@digia.com>
| * Updated submodules.Qt Submodule Update Bot2014-03-2710-0/+0
| | | | | | | | | | Change-Id: I982ee75828244f44a1f27b4aa2d5a2a5dabbcd63 Reviewed-by: Antti Kokko <antti.kokko@digia.com>
| * Updated submodules.Qt Submodule Update Bot2014-03-2613-0/+0
| | | | | | | | | | Change-Id: I06d2b3a720c1aa819e35ddd51c6cd5211d2748a6 Reviewed-by: Antti Kokko <antti.kokko@digia.com>
| * 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
| * | 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>
* | | Updated submodules.Qt Submodule Update Bot2014-04-095-0/+0
| | | | | | | | | | | | | | | Change-Id: I9b93bd0fa9b5011b27ab351ed143e6ada2ee643b Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | | Updated submodules.Qt Submodule Update Bot2014-04-045-0/+0
| | | | | | | | | | | | | | | Change-Id: I2c06e806a22480919b27133b080281cad06ebf26 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* | | Remove qt3d from qtlocation's dependency listAlex Blasche2014-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | QtLocation no longer depends on Qt3D. Change-Id: I0418dcc93a97722948bddcdd4f754914d7eaa019 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | | Updated submodules.Qt Submodule Update Bot2014-04-0232-0/+0
| |/ |/| | | | | | | Change-Id: Ib2385231c40547a3d6de2acaad978a2f5700ed36 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | 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
| | * 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 01:08:41 +0000