aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Updated submodules.Qt Submodule Update Bot2014-09-017-0/+0
| | | | | | | | | | Change-Id: I2159de889d951926d780041338d948f4a1281aa3 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * Updated submodules.Qt Submodule Update Bot2014-08-313-0/+0
| | | | | | | | | | Change-Id: Ifefebb996cc9dcb2cc2b06f57315a4a679f96420 Reviewed-by: Andrew Knight <andrew.knight@digia.com>
| * Updated submodules.Qt Submodule Update Bot2014-08-3016-0/+0
| | | | | | | | | | Change-Id: I2c3556629bab77b013eabcf6535512e902837e40 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * Updated license files in Qt5Jani Heikkinen2014-08-304-684/+475
| | | | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I49f5a4bf3481d6cd712301092f5f20a5dac470cf Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Add qtwebengine as submoduleFrederik Gladhorn2014-08-294-0/+6
| | | | | | | | | | | | | | | | | | | | | | qtwebkit is listed as an optional dependency for qtwebengine to ensure that qtwebkit and qtwebengine are not linked in parallel on the CI system. Otherwise we could run out of memory. Change-Id: Ib80d72407df03037c928d99f55c8e04e98e506d9 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| * Updated submodules.Qt Submodule Update Bot2014-08-2730-0/+0
| | | | | | | | | | Change-Id: Ie073b25926d4c538cb9f41d4c59d171857a60ede Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * Add QtWayland to default checkoutFrederik Gladhorn2014-08-202-0/+1
| | | | | | | | | | | | | | QtWayland is going to be released with Qt 5.4. Change-Id: I9a9bead92c6c34324510007ad844c9fdf633690d Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| * Add QtWebChannel as optional dependency of QtWebKit.Milian Wolff2014-08-151-3/+3
| | | | | | | | | | | | | | | | | | | | This is required to prepare the merge of the integration patch. The QtWebChannel and QtWebSockets lines in qt.pro are moved such that they occur before their first use in QtWebKit. Change-Id: Ie8137da57827776fe7b1434538df6b08108b0349 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * init-repository: Support submodules more than one dir deepJocelyn Turcotte2014-08-151-2/+4
| | | | | | | | | | Change-Id: I8783ded72032dda42bc24a855e190e0a2e699b01 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * init-repository: Make sure that we update a submodule before we recurseJocelyn Turcotte2014-08-151-0/+1
| | | | | | | | | | | | | | | | | | Unless we do so, doing git submodule init in a submodule would use the currently checked out version of its .gitmodule instead of the one of its pinned SHA1. Change-Id: I88de421c8d24748dcaa5334c82da2aac4b12b2ad Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| * Let init-repository build the mirror URL from the original URLJocelyn Turcotte2014-08-151-2/+2
| | | | | | | | | | | | | | | | | | | | This allows repositories that have a different submodule name than their URL file part to be using the mirror. i.e. qtwebengine's src/3rdparty mapped to .../qt/qtwebengine-chromium.git Change-Id: Ibea9cb9db701c95fc6f8b0e2457de74823aeeba5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Build Wayland on Linux (except Android)Frederik Gladhorn2014-08-141-1/+1
| | | | | | | | | | | | Change-Id: Ief1276f88837885637d0e60c90c4713bd12f6c85 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| * initialize qtwebengine's chromium submodule after cloning itAndras Becsi2014-08-121-0/+6
| | | | | | | | | | Change-Id: I7e3ef09eb437f700c6fe010ce44a711118e8bd75 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Revert "Skip not supported modules on wince."Alex Blasche2014-12-051-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | The decision to exclude wince builds from Qt is one the modules have to do and not the "build system". While there might be justification to do this for some modules the decision is a module decision and as such the individual modules should make it. This reverts commit d870bd65b0de87316007f94f8415c6a0baf4f516. Change-Id: I60fd9944a71968c819a27da91fdc58923bbbb776 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Updated submodules.Qt Submodule Update Bot2014-10-1630-0/+0
| | | | | | | | | | Change-Id: I869fce8a6bd6db20b58facdd2a476dacdf3b7d69 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Updated submodules.Qt Submodule Update Bot2014-09-126-0/+0
| | | | | | | | | | Change-Id: Ie3a3e5d05bb46e1f80d1c83d4d3c564040a6ae14 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Updated submodules.Qt Submodule Update Bot2014-09-0233-0/+0
| | | | | | | | | | Change-Id: Ie073b25926d4c538cb9f41d4c59d171857a60ede Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Skip not supported modules on wince.Bjoern Breitmeyer2014-08-281-6/+6
|/ | | | | | Change-Id: I6ac73c759453813718c6d96c7d6cb27bcbf9815b Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add qtwebchannel as submoduleFrederik Gladhorn2014-08-085-0/+6
| | | | | | | | This also updates the qtwebsockets revision since that's needed to compile. Change-Id: I9f3564c78d08abdca73ce395f31b3031a829e502 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Updated submodules.Qt Submodule Update Bot2014-08-0813-0/+0
| | | | | Change-Id: I6ccb1f47aa3f394d6e2e80ffcd0dada345d1fea1 Reviewed-by: Antti Kokko <antti.kokko@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-08-019-0/+0
| | | | | Change-Id: I091f46c34c950237bdd5054367b5c26e4c291fad Reviewed-by: Antti Kokko <antti.kokko@digia.com>
* Updated submodules.Qt Submodule Update Bot2014-07-3031-0/+0
| | | | | Change-Id: Iffab81d96aa4e91c14fe3ff888dd4323092a261e Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Remove jsondb from qtpim dependency listAlex Blasche2014-06-181-1/+1
| | | | | Change-Id: Icf05e7857b02db74c7309d796be7ef259cf83e37 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 10:43:24 +0000