mirror/qt/qt5.git
5 years agoremove qtjsondb 5.4_1411509232 95/95095/2
Joerg Bornemann [Wed, 17 Sep 2014 08:39:06 +0000 (10:39 +0200)]
remove qtjsondb

It's dead, Jim.

Change-Id: Id8e1ddb266018bfd582af27bb7eb860287e4567c
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoproperly recurse submodule initialization 98/92398/3
Oswald Buddenhagen [Fri, 15 Aug 2014 20:21:24 +0000 (22:21 +0200)]
properly recurse submodule initialization

Change-Id: Icd438b9da9af0275dd508186a265bc211d9d01ce
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
5 years agodon't unnecessarily initialize unwanted submodules 97/92397/3
Oswald Buddenhagen [Fri, 15 Aug 2014 19:38:54 +0000 (21:38 +0200)]
don't unnecessarily initialize unwanted submodules

it wastes time and causes output noise.

Change-Id: Ifee01150293431b3c528f30a46280bd142e30b22
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
5 years agodon't uninit submodules before re-initing 96/92396/3
Oswald Buddenhagen [Fri, 15 Aug 2014 18:04:48 +0000 (20:04 +0200)]
don't uninit submodules before re-initing

git-submodule init will simply not touch the already initialized
submodules. this is just fine, as we'll overwrite the config entries
with our own urls (and remove the obsolete ones) afterwards anyway.

Change-Id: I6372bd48be9792e456899dc829226921990140c4
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
5 years agokeep information about default repos in .gitmodules 95/92395/3
Oswald Buddenhagen [Fri, 15 Aug 2014 17:11:24 +0000 (19:11 +0200)]
keep information about default repos in .gitmodules

it's backwards to keep this in the script itself.

Change-Id: I4248ba3fef984bdff5d034cb2e6db6cae3209d68
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
5 years agodon't pass around url unnecessarily 94/92394/3
Oswald Buddenhagen [Fri, 15 Aug 2014 19:42:41 +0000 (21:42 +0200)]
don't pass around url unnecessarily

we now have everything we need to construct it on the fly.

Change-Id: I129e49bbcf46428d0fcef31ab8188df9d6a4026c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
5 years agoget submodule urls from .gitmodules 93/92393/3
Oswald Buddenhagen [Fri, 15 Aug 2014 19:24:21 +0000 (21:24 +0200)]
get submodule urls from .gitmodules

keeping a redundant copy in the script is plain backwards.

Change-Id: Ibdd1bab9d2cb5af7d7747d5caa2afc7d6e7571ad
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
5 years agorewrite submodule exclusion logic 92/92392/3
Oswald Buddenhagen [Fri, 15 Aug 2014 19:03:25 +0000 (21:03 +0200)]
rewrite submodule exclusion logic

instead of doing multiple passes over the submodules, do everything in
one go.

as a bonus, as the internal structure uses exclusion entries in the
module list, we can make that feature user-accessible just as well.

Change-Id: I8bfb30c8051a9150f92e2e124ff52f64e3efe03c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
5 years agonuke the --http option 91/92391/3
Oswald Buddenhagen [Fri, 15 Aug 2014 17:54:23 +0000 (19:54 +0200)]
nuke the --http option

it was a vestige from the times when the submodules had absolute urls
pointing at git://gitorious.org. as we now use relative urls, things
work just fine without that option.

Change-Id: I5e93ff8cd2497a27cfbdd53dbcf9db3cd0c4cd1d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
5 years agoUpdated submodules. 5.4_1411477929
Qt Submodule Update Bot [Tue, 23 Sep 2014 12:57:35 +0000 (15:57 +0300)]
Updated submodules.

Change-Id: I919c0332ff9f5ad1979de3105721c2ba5aacf634
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
5 years agoUpdated submodules. 5.4_1410793854
Qt Submodule Update Bot [Mon, 15 Sep 2014 10:20:38 +0000 (13:20 +0300)]
Updated submodules.

Change-Id: I1e275c54ea722d4f882cf329b65b749aa4d45fb2
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
5 years agoUpdated submodules. 5.4_1410446308
Qt Submodule Update Bot [Thu, 11 Sep 2014 12:11:42 +0000 (15:11 +0300)]
Updated submodules.

Change-Id: I5fdb4490cb85b3470bdbd81de9dccbe6bcb96460
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
5 years agoinit-repository: Support cases where $submodule/.git is a file 5.4_1410366344 80/92380/2
Jocelyn Turcotte [Fri, 15 Aug 2014 15:37:02 +0000 (17:37 +0200)]
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>
5 years agoUpdated submodules. 5.4_1410099506 65/94065/9 v5.4.0-alpha1
Qt Submodule Update Bot [Sun, 7 Sep 2014 10:20:41 +0000 (13:20 +0300)]
Updated submodules.

Change-Id: I74d7cf7e426ba4e1aa640ac986fbbe52d1e82897
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
5 years agoUpdated submodules. 5.4_1409822299
Qt Submodule Update Bot [Thu, 4 Sep 2014 02:20:49 +0000 (05:20 +0300)]
Updated submodules.

Change-Id: If16e291eea490110a9749b65fa4d21988376755a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
5 years agoUpdated submodules. 5.4_1409683131
Qt Submodule Update Bot [Tue, 2 Sep 2014 18:30:47 +0000 (21:30 +0300)]
Updated submodules.

Change-Id: Iaa47c338f81e080e1fde4501e72ee48c9330e1be
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
5 years agoUpdated submodules. 5.4_1409586014
Qt Submodule Update Bot [Mon, 1 Sep 2014 14:48:20 +0000 (17:48 +0300)]
Updated submodules.

Change-Id: I2159de889d951926d780041338d948f4a1281aa3
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
5 years agoUpdated submodules. 5.4_1409490068
Qt Submodule Update Bot [Sun, 31 Aug 2014 02:20:19 +0000 (05:20 +0300)]
Updated submodules.

Change-Id: Ifefebb996cc9dcb2cc2b06f57315a4a679f96420
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
5 years agoUpdated submodules. 5.4_1409368449
Qt Submodule Update Bot [Sat, 30 Aug 2014 02:20:19 +0000 (05:20 +0300)]
Updated submodules.

Change-Id: I2c3556629bab77b013eabcf6535512e902837e40
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
5 years agoUpdated license files in Qt5 10/92710/6
Jani Heikkinen [Wed, 20 Aug 2014 09:14:27 +0000 (12:14 +0300)]
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>
5 years agoAdd qtwebengine as submodule 5.4_1409328150 35/90935/21
Frederik Gladhorn [Tue, 29 Jul 2014 11:50:30 +0000 (13:50 +0200)]
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>
5 years agoUpdated submodules. 5.4_1409164478 71/92171/29
Qt Submodule Update Bot [Wed, 27 Aug 2014 18:19:31 +0000 (21:19 +0300)]
Updated submodules.

Change-Id: Ie073b25926d4c538cb9f41d4c59d171857a60ede
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
5 years agoAdd QtWayland to default checkout 5.4_1408532433 54/91954/5
Frederik Gladhorn [Mon, 11 Aug 2014 14:23:41 +0000 (16:23 +0200)]
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>
5 years agoAdd QtWebChannel as optional dependency of QtWebKit. 5.4_1408086232 27/91827/2
Milian Wolff [Sat, 9 Aug 2014 11:41:29 +0000 (13:41 +0200)]
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>
5 years agoinit-repository: Support submodules more than one dir deep 41/92241/2
Jocelyn Turcotte [Thu, 14 Aug 2014 11:44:52 +0000 (13:44 +0200)]
init-repository: Support submodules more than one dir deep

Change-Id: I8783ded72032dda42bc24a855e190e0a2e699b01
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
5 years agoinit-repository: Make sure that we update a submodule before we recurse 99/92199/2
Jocelyn Turcotte [Wed, 13 Aug 2014 19:50:53 +0000 (21:50 +0200)]
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>
5 years agoLet init-repository build the mirror URL from the original URL 76/92176/2
Jocelyn Turcotte [Wed, 13 Aug 2014 12:46:46 +0000 (14:46 +0200)]
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>
5 years agoBuild Wayland on Linux (except Android) 5.4_1408020824 42/92042/3
Frederik Gladhorn [Tue, 12 Aug 2014 09:31:27 +0000 (11:31 +0200)]
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>
6 years agoinitialize qtwebengine's chromium submodule after cloning it 5.4_1407852228 31/91931/6
Andras Becsi [Mon, 11 Aug 2014 13:04:25 +0000 (15:04 +0200)]
initialize qtwebengine's chromium submodule after cloning it

Change-Id: I7e3ef09eb437f700c6fe010ce44a711118e8bd75
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
6 years agoAdd qtwebchannel as submodule dev_1407523519 99/90399/9
Frederik Gladhorn [Tue, 22 Jul 2014 18:08:31 +0000 (20:08 +0200)]
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>
6 years agoUpdated submodules. dev_1407480235
Qt Submodule Update Bot [Fri, 8 Aug 2014 02:34:21 +0000 (05:34 +0300)]
Updated submodules.

Change-Id: I6ccb1f47aa3f394d6e2e80ffcd0dada345d1fea1
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
6 years agoUpdated submodules. dev_1406875341
Qt Submodule Update Bot [Fri, 1 Aug 2014 02:34:11 +0000 (05:34 +0300)]
Updated submodules.

Change-Id: I091f46c34c950237bdd5054367b5c26e4c291fad
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
6 years agoUpdated submodules. dev_1406700567
Qt Submodule Update Bot [Wed, 30 Jul 2014 02:34:15 +0000 (05:34 +0300)]
Updated submodules.

Change-Id: Iffab81d96aa4e91c14fe3ff888dd4323092a261e
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoRemove jsondb from qtpim dependency list dev_1403102045 27/87227/2
Alex Blasche [Thu, 12 Jun 2014 08:25:23 +0000 (10:25 +0200)]
Remove jsondb from qtpim dependency list

Change-Id: Icf05e7857b02db74c7309d796be7ef259cf83e37
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
6 years agoUpdated submodules. dev_1403038533 26/86326/36
Qt Submodule Update Bot [Tue, 17 Jun 2014 19:13:26 +0000 (22:13 +0300)]
Updated submodules.

Change-Id: If4479c349b595d28e0dd4985259d7d1ed00bb966
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
6 years agoUpdated submodules. dev_1401868674
Sergio Ahumada [Wed, 28 May 2014 02:34:09 +0000 (05:34 +0300)]
Updated submodules.

Change-Id: I000a16c22c4c3dc7d0e02aeb370454f386bb09f1
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
6 years agoMerge remote-tracking branch 'origin/stable' into dev dev_1401118448 dev_1401118818 dev_1401139845 dev_1401164373 32/86232/1
Sergio Ahumada [Mon, 26 May 2014 13:44:12 +0000 (15:44 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ib1694808847f26576cc3c7780bd1c6d3689a8a26

6 years agoUpdated submodules. stable_1401010650
Qt Submodule Update Bot [Sun, 25 May 2014 00:33:42 +0000 (03:33 +0300)]
Updated submodules.

Change-Id: I620dc10e25cac7386182a6ff272b904f5f9f1a0d
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1400647933
Qt Submodule Update Bot [Wed, 21 May 2014 00:33:53 +0000 (03:33 +0300)]
Updated submodules.

Change-Id: I64f379141c59c193e3ebba5816495498c1ed0e64
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agodon't claim that multimedia needs quick stable_1399999860
Oswald Buddenhagen [Mon, 28 Apr 2014 08:58:26 +0000 (10:58 +0200)]
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>
6 years agoUpdated submodules.
Qt Submodule Update Bot [Tue, 13 May 2014 16:33:36 +0000 (19:33 +0300)]
Updated submodules.

Change-Id: Ic9eb01ba38cca9c77a533f32d5f2f0519ec56aa3
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
6 years agoUpdated submodules. stable_1399203557
Qt Submodule Update Bot [Sun, 4 May 2014 08:33:33 +0000 (11:33 +0300)]
Updated submodules.

Change-Id: I25acd00fedc81040b0b108120b21deedafcf7fa4
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
6 years agoUpdated submodules. stable_1398538294
Qt Submodule Update Bot [Sat, 26 Apr 2014 00:33:58 +0000 (03:33 +0300)]
Updated submodules.

Change-Id: I055e2822456ad09cc939c628e4a86105eda5dade
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1397059926
Qt Submodule Update Bot [Wed, 9 Apr 2014 15:30:15 +0000 (18:30 +0300)]
Updated submodules.

Change-Id: I56a5eee34a20e5de06ee8b430afa5c32ca6b94c6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. dev_1397020116
Qt Submodule Update Bot [Tue, 8 Apr 2014 19:00:53 +0000 (22:00 +0300)]
Updated submodules.

Change-Id: I9b93bd0fa9b5011b27ab351ed143e6ada2ee643b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1396640926
Qt Submodule Update Bot [Fri, 4 Apr 2014 16:33:28 +0000 (19:33 +0300)]
Updated submodules.

Change-Id: I2c0f1cfb71d44eed5fb4eaacc93d931e46df9512
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. dev_1396601691
Qt Submodule Update Bot [Thu, 3 Apr 2014 18:37:18 +0000 (21:37 +0300)]
Updated submodules.

Change-Id: I2c06e806a22480919b27133b080281cad06ebf26
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
6 years agoUpdated submodules. stable_1396502455
Qt Submodule Update Bot [Thu, 3 Apr 2014 00:33:55 +0000 (03:33 +0300)]
Updated submodules.

Change-Id: I4fadcf5d88abca2ae886dd4483ca2838bfdbce19
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoRemove qt3d from qtlocation's dependency list dev_1396433653
Alex Blasche [Tue, 25 Mar 2014 08:36:38 +0000 (09:36 +0100)]
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>
6 years agoUpdated submodules. dev_1396414562
Qt Submodule Update Bot [Wed, 2 Apr 2014 02:33:39 +0000 (05:33 +0300)]
Updated submodules.

Change-Id: Ib2385231c40547a3d6de2acaad978a2f5700ed36
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1396375914
Qt Submodule Update Bot [Tue, 1 Apr 2014 16:33:32 +0000 (19:33 +0300)]
Updated submodules.

Change-Id: Ifb66951776e8decb8784c80fb7ed02864253065b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1395990237
Qt Submodule Update Bot [Fri, 28 Mar 2014 01:34:40 +0000 (03:34 +0200)]
Updated submodules.

Change-Id: I55e55c405f6e950dcc623b1f7d7faa09bc8c950f
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
6 years agoUpdated submodules. stable_1395949126
Qt Submodule Update Bot [Thu, 27 Mar 2014 17:51:14 +0000 (19:51 +0200)]
Updated submodules.

Change-Id: I982ee75828244f44a1f27b4aa2d5a2a5dabbcd63
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
6 years agoUpdated submodules. stable_1395816335
Qt Submodule Update Bot [Wed, 26 Mar 2014 01:34:58 +0000 (03:34 +0200)]
Updated submodules.

Change-Id: I06d2b3a720c1aa819e35ddd51c6cd5211d2748a6
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
6 years agoUpdated submodules. stable_1395492164 v5.3.0-beta1
Qt Submodule Update Bot [Sat, 22 Mar 2014 01:33:37 +0000 (03:33 +0200)]
Updated submodules.

Change-Id: Ib065abc7fd89c5766c5a060b295ea19154c02f64
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
6 years agoAdd qtenginio#stable as part of the default modules stable_1395404245
Sergio Ahumada [Mon, 17 Mar 2014 16:08:16 +0000 (17:08 +0100)]
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>
6 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 21 Mar 2014 08:29:24 +0000 (10:29 +0200)]
Updated submodules.

Change-Id: Ie045c5319823add1aeca81b2ca44ce913cac4f74
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1395255228
Qt Submodule Update Bot [Wed, 19 Mar 2014 18:51:39 +0000 (20:51 +0200)]
Updated submodules.

Change-Id: I6d47ef2b92d142bd2777a8c0d2abc4c758fbcb8b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1395118949
Qt Submodule Update Bot [Tue, 18 Mar 2014 01:33:34 +0000 (03:33 +0200)]
Updated submodules.

Change-Id: I74af16bd0da5e2dc9e5b265d26e564201cc31b78
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1394972124
Qt Submodule Update Bot [Sun, 16 Mar 2014 01:33:24 +0000 (03:33 +0200)]
Updated submodules.

Change-Id: I556a3377ffb8348cdc2301b45c445c2f244ccf6a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
6 years agoUpdated submodules. stable_1394888719
Qt Submodule Update Bot [Sat, 15 Mar 2014 12:59:43 +0000 (14:59 +0200)]
Updated submodules.

Change-Id: I8ce1937883833b7e66453e3764e390d0dc44b925
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1394432218
Qt Submodule Update Bot [Sun, 9 Mar 2014 17:34:18 +0000 (19:34 +0200)]
Updated submodules.

Change-Id: Ie198c124d3259dea657fcfa4c9b9b43bcd2d9fd0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1394224355
Qt Submodule Update Bot [Fri, 7 Mar 2014 17:34:18 +0000 (19:34 +0200)]
Updated submodules.

Change-Id: I7704ce065db8050837d8bf97f8f4c1798b6d92fb
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
6 years agoUpdated submodules. stable_1394130897
Qt Submodule Update Bot [Thu, 6 Mar 2014 17:34:23 +0000 (19:34 +0200)]
Updated submodules.

Change-Id: I592415857ca8c6cbd2854dd9de0a573f29842161
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
6 years agoUpdated submodules. stable_1394043786
Qt Submodule Update Bot [Wed, 5 Mar 2014 17:34:29 +0000 (19:34 +0200)]
Updated submodules.

Change-Id: Ie169f588d85737831df044e2661484cb734b19eb
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
6 years agoUpdated submodules. stable_1393928993
Qt Submodule Update Bot [Tue, 4 Mar 2014 09:34:55 +0000 (11:34 +0200)]
Updated submodules.

Change-Id: I6380ce86f1f835ca6d6398fef301fbfb9748137a
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
6 years agoUpdated submodules. stable_1393854703
Qt Submodule Update Bot [Mon, 3 Mar 2014 01:34:18 +0000 (03:34 +0200)]
Updated submodules.

Change-Id: Ied6175da93a16e2733c2dcc266761ba91f225ada
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
6 years agoautomatically install hooks stable_1393593499
Oswald Buddenhagen [Mon, 10 Feb 2014 20:30:52 +0000 (21:30 +0100)]
automatically install hooks

Change-Id: I2fabc610dd69730cfdac45046d4bbc6f53822fc4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
6 years agoUpdated submodules. stable_1393569676
Qt Submodule Update Bot [Fri, 28 Feb 2014 01:34:16 +0000 (03:34 +0200)]
Updated submodules.

Change-Id: I63200543dde700d6b0fd343800793adb6e180bad
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. 10/78910/9 v5.3.0-alpha1
Qt Submodule Update Bot [Wed, 26 Feb 2014 05:33:29 +0000 (07:33 +0200)]
Updated submodules.

Change-Id: I0a23321599c73357c6f724f204b480ba7311e51a

6 years agonuke qlalr submodule stable_1393090930
Oswald Buddenhagen [Wed, 5 Feb 2014 17:48:20 +0000 (18:48 +0100)]
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>
6 years agoUpdated submodules. stable_1392965807
Qt Submodule Update Bot [Fri, 21 Feb 2014 01:34:36 +0000 (03:34 +0200)]
Updated submodules.

Change-Id: Idc199e37d59beb8a4801a599dd5a0ff9ee2c23f8
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoremove reviewed-by template 55/78455/2
Oswald Buddenhagen [Tue, 18 Feb 2014 16:58:00 +0000 (17:58 +0100)]
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

6 years agoMerge remote-tracking branch 'gerrit/dev' into stable
Oswald Buddenhagen [Wed, 19 Feb 2014 15:13:02 +0000 (16:13 +0100)]
Merge remote-tracking branch 'gerrit/dev' into stable

Change-Id: I7e15ecc9ce71063757677e5c8b07e3c0167c857c

6 years agoUpdated submodules. stable_1392666344 51/78351/22
Qt Submodule Update Bot [Mon, 17 Feb 2014 17:34:17 +0000 (19:34 +0200)]
Updated submodules.

Change-Id: Ife236cc44c61eab39bec31a5ac9c0647934b03af
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoAdd qtwebsockets as submodule dev_1392615200
Frederik Gladhorn [Thu, 24 Oct 2013 10:30:47 +0000 (12:30 +0200)]
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>
6 years agoUpdated submodules. stable_1392536784
Qt Submodule Update Bot [Sun, 16 Feb 2014 01:34:18 +0000 (03:34 +0200)]
Updated submodules.

Change-Id: I7befa702530b486531fbbc2ef7ed4d3195e2ad54
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. dev_1392483647
Qt Submodule Update Bot [Sat, 15 Feb 2014 11:34:21 +0000 (13:34 +0200)]
Updated submodules.

Change-Id: Iae9c68d190f22ef0e32546c7a3f513e9175ef3fc
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1392480846
Qt Submodule Update Bot [Sat, 15 Feb 2014 09:34:13 +0000 (11:34 +0200)]
Updated submodules.

Change-Id: I805c735b027c237245a0083a1d827bb9f64c21ce
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1392284644
Qt Submodule Update Bot [Thu, 13 Feb 2014 08:08:51 +0000 (10:08 +0200)]
Updated submodules.

Change-Id: Ib25883ebaafe1b86077d77d5598355d1f9320a5a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. dev_1392037489
Qt Submodule Update Bot [Mon, 10 Feb 2014 03:34:05 +0000 (05:34 +0200)]
Updated submodules.

Change-Id: I3b525e1235e9ec27db475fac6086a884297d1634
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoMerge "Merge branch 'stable' into dev" into refs/staging/dev dev_1391672828
Friedemann Kleint [Thu, 6 Feb 2014 07:46:01 +0000 (08:46 +0100)]
Merge "Merge branch 'stable' into dev" into refs/staging/dev

6 years agoUpdated submodules. dev_1391600960
Qt Submodule Update Bot [Wed, 5 Feb 2014 11:38:12 +0000 (13:38 +0200)]
Updated submodules.

Change-Id: If37564a74908846d69141b95c7edd938f4fc2379
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoMerge branch 'stable' into dev dev_1391590422 49/76849/1
Frederik Gladhorn [Wed, 29 Jan 2014 12:50:59 +0000 (13:50 +0100)]
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

6 years agodon't unnecessarily confuse qt creator stable_1390457979
Oswald Buddenhagen [Tue, 12 Nov 2013 15:35:05 +0000 (16:35 +0100)]
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>
6 years agoUpdated submodules. stable_1390240332
Qt Submodule Update Bot [Mon, 20 Jan 2014 17:34:32 +0000 (19:34 +0200)]
Updated submodules.

Change-Id: Ia968d5d5314ac04835e90be462b1a71f8ab293e9
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
6 years agoUpdated submodules. stable_1390219581
Qt Submodule Update Bot [Mon, 20 Jan 2014 09:34:08 +0000 (11:34 +0200)]
Updated submodules.

Change-Id: I5fd794ca6d89ea5787cb1b7d2dcabc6f7b75776a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1389948410
Qt Submodule Update Bot [Fri, 17 Jan 2014 01:34:49 +0000 (03:34 +0200)]
Updated submodules.

Change-Id: Ic8d3a71d7cf7e92224064aa989a9551ee52c9d57
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoAdd QtAndroidExtras to dependency list of QtConnectivity dev_1389705656
Alex Blasche [Thu, 28 Nov 2013 11:12:45 +0000 (12:12 +0100)]
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>
6 years agoUpdated submodules. dev_1389438124
Qt Submodule Update Bot [Sat, 11 Jan 2014 03:33:56 +0000 (05:33 +0200)]
Updated submodules.

Change-Id: Ibaac9b5129cd252d65ce5896bac05e96abe6859c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
6 years agoUpdated submodules. stable_1389340221
Qt Submodule Update Bot [Fri, 10 Jan 2014 01:34:23 +0000 (03:34 +0200)]
Updated submodules.

Change-Id: I402457bcfbad53c6dd2214290c668ece693bbdcd
Reviewed-by: Matti Paaso <matti.paaso@digia.com>
6 years agoUpdated submodules. stable_1389286933
Qt Submodule Update Bot [Thu, 9 Jan 2014 01:33:40 +0000 (03:33 +0200)]
Updated submodules.

Change-Id: I06d0fa240f6a0f99770e51969543608dbaf5f7e0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
6 years agoUpdated submodules. dev_1389250878
Qt Submodule Update Bot [Thu, 9 Jan 2014 03:33:54 +0000 (05:33 +0200)]
Updated submodules.

Change-Id: If7b7ff4f9fdd710ef78a953113e87393597e3e80
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
6 years agoUpdated submodules. stable_1388647506
Qt Submodule Update Bot [Wed, 1 Jan 2014 01:33:43 +0000 (03:33 +0200)]
Updated submodules.

Change-Id: Ia250914fecb288f82db6a7b53e70d433898eb2f4
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1387519987
Qt Submodule Update Bot [Fri, 20 Dec 2013 01:33:43 +0000 (03:33 +0200)]
Updated submodules.

Change-Id: Iec0c8697aa573d7bdec000ab2e6fb0729c0793bc
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. dev_1387194533
Qt Submodule Update Bot [Mon, 16 Dec 2013 11:33:30 +0000 (13:33 +0200)]
Updated submodules.

Change-Id: Id00002337613fa6681aed81193565ed7a5a4e472
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
6 years agoUpdated submodules. stable_1387190468
Qt Submodule Update Bot [Mon, 16 Dec 2013 09:33:41 +0000 (11:33 +0200)]
Updated submodules.

Change-Id: I7c73e564bd61faa38fdd51947f8d98c03230f104
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agotry to make the ChangeLog template more inviting stable_1385821674
Oswald Buddenhagen [Mon, 25 Nov 2013 10:45:03 +0000 (11:45 +0100)]
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>
6 years agoUpdated submodules. stable_1384099895
Qt Submodule Update Bot [Sun, 10 Nov 2013 01:33:34 +0000 (03:33 +0200)]
Updated submodules.

Change-Id: I749bc264b23ead54af325301479320766afce090
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1383736831
Qt Submodule Update Bot [Wed, 6 Nov 2013 01:33:44 +0000 (03:33 +0200)]
Updated submodules.

Change-Id: I234dcbfcba1e934b05ed0da921f69700ca480ddf
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>