lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-02 03:36:54 +08:00
Code Issues Packages Projects Releases Wiki Activity
941 Commits 118 Branches 270 Tags
1e275c54ea722d4f882cf329b65b749aa4d45fb2
Commit Graph

941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
1e275c54ea Updated submodules. 
Change-Id: I5fdb4490cb85b3470bdbd81de9dccbe6bcb96460
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-09-11 16:30:52 +02:00
Jocelyn Turcotte
1ae0689829 init-repository: Support cases where $submodule/.git is a file 
Since git 1.7.8 the $GIT_DIR of the submodule can be a reference to the
super-module's $GIT_DIR/modules/<name>/

Test for existence instead of testing for a directory before attempting
a git clone there.

Change-Id: Ic539e770067da1417a2ad374c21253212473abe6
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2014-09-10 18:24:13 +02:00
Qt Submodule Update Bot
5fdb4490cb Updated submodules. 
Change-Id: I74d7cf7e426ba4e1aa640ac986fbbe52d1e82897
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
v5.4.0-alpha1 		2014-09-07 16:17:49 +02:00
Qt Submodule Update Bot
74d7cf7e42 Updated submodules. 
Change-Id: If16e291eea490110a9749b65fa4d21988376755a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-09-04 11:16:45 +02:00
Qt Submodule Update Bot
f16e291eea Updated submodules. 
Change-Id: Iaa47c338f81e080e1fde4501e72ee48c9330e1be
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-09-02 20:34:14 +02:00
Qt Submodule Update Bot
aa47c338f8 Updated submodules. 
Change-Id: I2159de889d951926d780041338d948f4a1281aa3
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-09-01 17:06:23 +02:00
Qt Submodule Update Bot
2159de889d Updated submodules. 
Change-Id: Ifefebb996cc9dcb2cc2b06f57315a4a679f96420
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
 2014-08-31 14:59:32 +02:00
Qt Submodule Update Bot
fefebb996c Updated submodules. 
Change-Id: I2c3556629bab77b013eabcf6535512e902837e40
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-08-30 05:11:09 +02:00
Jani Heikkinen
59c32b2db8 Updated license files in Qt5 
- 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>
 2014-08-30 05:10:46 +02:00
Frederik Gladhorn
22e5c8ce25 Add qtwebengine as submodule 
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>
 2014-08-29 14:28:35 +02:00
Qt Submodule Update Bot
2c3556629b Updated submodules. 
Change-Id: Ie073b25926d4c538cb9f41d4c59d171857a60ede
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-08-27 20:33:00 +02:00
Frederik Gladhorn
64b0e38032 Add QtWayland to default checkout 
QtWayland is going to be released with Qt 5.4.

Change-Id: I9a9bead92c6c34324510007ad844c9fdf633690d
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
 2014-08-20 12:56:30 +02:00
Milian Wolff
be6de20889 Add QtWebChannel as optional dependency of QtWebKit. 
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>
 2014-08-15 09:03:39 +02:00
Jocelyn Turcotte
633051d095 init-repository: Support submodules more than one dir deep 
Change-Id: I8783ded72032dda42bc24a855e190e0a2e699b01
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
 2014-08-15 09:03:24 +02:00
Jocelyn Turcotte
ce45f45dfb init-repository: Make sure that we update a submodule before we recurse 
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>
 2014-08-15 09:03:16 +02:00
Jocelyn Turcotte
8801fd0258 Let init-repository build the mirror URL from the original URL 
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>
 2014-08-15 09:02:58 +02:00
Frederik Gladhorn
48cd6bb500 Build Wayland on Linux (except Android) 
Change-Id: Ief1276f88837885637d0e60c90c4713bd12f6c85
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
 2014-08-14 14:25:13 +02:00
Andras Becsi
ed9a5c8a62 initialize qtwebengine's chromium submodule after cloning it 
Change-Id: I7e3ef09eb437f700c6fe010ce44a711118e8bd75
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
 2014-08-12 16:03:32 +02:00
Frederik Gladhorn
9677483cdc Add qtwebchannel as submodule 
This also updates the qtwebsockets revision since
that's needed to compile.

Change-Id: I9f3564c78d08abdca73ce395f31b3031a829e502
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
 2014-08-08 19:50:01 +02:00
Qt Submodule Update Bot
e073b25926 Updated submodules. 
Change-Id: I6ccb1f47aa3f394d6e2e80ffcd0dada345d1fea1
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
 2014-08-08 07:48:56 +02:00
Qt Submodule Update Bot
6ccb1f47aa Updated submodules. 
Change-Id: I091f46c34c950237bdd5054367b5c26e4c291fad
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
 2014-08-01 07:44:21 +02:00
Qt Submodule Update Bot
091f46c34c Updated submodules. 
Change-Id: Iffab81d96aa4e91c14fe3ff888dd4323092a261e
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-07-30 08:04:43 +02:00
Alex Blasche
f81391639e Remove jsondb from qtpim dependency list 
Change-Id: Icf05e7857b02db74c7309d796be7ef259cf83e37
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
 2014-06-18 16:23:26 +02:00
Qt Submodule Update Bot
ffab81d96a Updated submodules. 
Change-Id: If4479c349b595d28e0dd4985259d7d1ed00bb966
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
 2014-06-17 22:54:51 +02:00
Sergio Ahumada
892e391cb0 Updated submodules. 
Change-Id: I000a16c22c4c3dc7d0e02aeb370454f386bb09f1
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
 2014-06-04 09:56:56 +02:00
Sergio Ahumada
7368b4b1e3 Merge remote-tracking branch 'origin/stable' into dev 
Change-Id: Ib1694808847f26576cc3c7780bd1c6d3689a8a26
 2014-05-26 15:44:48 +02:00
Qt Submodule Update Bot
f4479c349b Updated submodules. 
Change-Id: I620dc10e25cac7386182a6ff272b904f5f9f1a0d
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-05-25 11:15:55 +02:00
Qt Submodule Update Bot
620dc10e25 Updated submodules. 
Change-Id: I64f379141c59c193e3ebba5816495498c1ed0e64
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-05-21 06:51:08 +02:00
Oswald Buddenhagen
3fb8e1301a don't claim that multimedia needs quick 
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>
 2014-05-13 18:49:52 +02:00
Qt Submodule Update Bot
64f379141c Updated submodules. 
Change-Id: Ic9eb01ba38cca9c77a533f32d5f2f0519ec56aa3
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
 2014-05-13 18:49:40 +02:00
Qt Submodule Update Bot
c9eb01ba38 Updated submodules. 
Change-Id: I25acd00fedc81040b0b108120b21deedafcf7fa4
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
 2014-05-04 13:24:01 +02:00
Qt Submodule Update Bot
25acd00fed Updated submodules. 
Change-Id: I055e2822456ad09cc939c628e4a86105eda5dade
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-04-26 19:55:35 +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
afd8acb9dc Updated submodules. 
Change-Id: I9b93bd0fa9b5011b27ab351ed143e6ada2ee643b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-04-09 07:07:13 +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
9b93bd0fa9 Updated submodules. 
Change-Id: I2c06e806a22480919b27133b080281cad06ebf26
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
 2014-04-04 10:53:08 +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
Alex Blasche
60f5070d97 Remove qt3d from qtlocation's dependency list 
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>
 2014-04-02 12:12:44 +02:00
Qt Submodule Update Bot
2c06e806a2 Updated submodules. 
Change-Id: Ib2385231c40547a3d6de2acaad978a2f5700ed36
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-04-02 06:54:36 +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