mirror/qt/qt5.git
5 years agoQtWebEngine: add dependency on QtWebChannel dev_1423693106 54/105854/3
Pierre Rossi [Tue, 10 Feb 2015 15:27:39 +0000 (16:27 +0100)]
QtWebEngine: add dependency on QtWebChannel

To allow using the integration that makes use of a custom transport over
Chromium IPC.
Also add QtLocation as an optional dependency for correctness, and
update the pinned sha1

Change-Id: I71d88be0859a74ad82f539d00f02b51d1c3e5218
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
5 years agoQtLocation doesn't depend on QtMultimedia anymore. dev_1423030595 82/105082/2
Alex Blasche [Mon, 2 Feb 2015 08:22:29 +0000 (09:22 +0100)]
QtLocation doesn't depend on QtMultimedia anymore.

Change-Id: Id75a7fc591064639a38694149517924dd33b56fb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
5 years agoUpdated submodules. dev_1422526250 16/102416/101
Qt Submodule Update Bot [Thu, 29 Jan 2015 03:34:55 +0000 (05:34 +0200)]
Updated submodules.

Change-Id: I25db2aa87f437c03d7929959c3e6d94d9fc0d541
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoQt3D depends upon qtimageformats module dev_1419943489 49/99749/4
Sean Harmer [Thu, 13 Nov 2014 10:51:35 +0000 (10:51 +0000)]
Qt3D depends upon qtimageformats module

Qt3D makes use of the webp image format in its examples to minimize
the size of assets. Support for webp is provided by qtimageformats.

Change-Id: Id70b584123dc6174848947029ee034593ccc42e0
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. dev_1418888205 40/101640/30
Qt Submodule Update Bot [Thu, 18 Dec 2014 03:35:33 +0000 (05:35 +0200)]
Updated submodules.

Change-Id: Ia68a6b964f770fef3ea3d52f29d0c7a86186e80c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoadjust submodule branch names for dev branch
Oswald Buddenhagen [Fri, 5 Dec 2014 13:33:26 +0000 (14:33 +0100)]
adjust submodule branch names for dev branch

Change-Id: I65ea644943aa345b8f0fd1d5fcdfccf8f86ed914
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
5 years agoMerge remote-tracking branch 'origin/5.4' into dev 96/93496/8
Oswald Buddenhagen [Fri, 5 Dec 2014 13:51:52 +0000 (14:51 +0100)]
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Ia8938b7bb2c0393c1799b64309c3cadc7293ad8e
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
5 years agoRevert "Skip not supported modules on wince." 68/94068/2
Alex Blasche [Fri, 5 Sep 2014 06:42:01 +0000 (08:42 +0200)]
Revert "Skip not supported modules on wince."

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>
5 years agoUpdated submodules. 5.4_1417520248 25/100425/26
Qt Submodule Update Bot [Tue, 2 Dec 2014 03:22:31 +0000 (05:22 +0200)]
Updated submodules.

Change-Id: I968f8a2a5ef20c47184d15b8f9e92a795176fcb2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
5 years agoadjust submodule branch names for 5.4 branch 93/101093/2
Oswald Buddenhagen [Mon, 1 Dec 2014 12:42:49 +0000 (13:42 +0100)]
adjust submodule branch names for 5.4 branch

Change-Id: I1621fee44becf1940d7d50a604fa8c91f3be78d9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
5 years agoMerge remote-tracking branch 'origin/5.4.0' into 5.4 06/100806/1 06/100806/2
Oswald Buddenhagen [Tue, 25 Nov 2014 17:00:25 +0000 (18:00 +0100)]
Merge remote-tracking branch 'origin/5.4.0' into 5.4

Change-Id: I5b2910fc4e8fece8fad42eb200ed6dffdd24f751

5 years agoUpdated submodules. 5.4.0_1416890421 70/100570/4
Qt Submodule Update Bot [Tue, 25 Nov 2014 04:05:03 +0000 (06:05 +0200)]
Updated submodules.

Change-Id: I77f387bc89c06d870b7d41516734ee3f1c68e71a
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.0_1416559907 29/100429/3 v5.4.0-rc1
Qt Submodule Update Bot [Fri, 21 Nov 2014 08:24:14 +0000 (10:24 +0200)]
Updated submodules.

Change-Id: I7c0bc2305680fac216bbaa72ac83f65b04feffff
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4_1416474085 86/99286/21
Qt Submodule Update Bot [Wed, 19 Nov 2014 20:06:39 +0000 (22:06 +0200)]
Updated submodules.

Change-Id: Icafd720586cfe92d6e5773d553f6e70594f6c7dc
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.0_1416463320 15/100315/2
Qt Submodule Update Bot [Wed, 19 Nov 2014 21:29:18 +0000 (23:29 +0200)]
Updated submodules.

Change-Id: I4b199501287c5a5961405ae0667c04dc1188af44
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.0_1416374211 08/99808/15
Qt Submodule Update Bot [Tue, 18 Nov 2014 22:36:57 +0000 (00:36 +0200)]
Updated submodules.

Change-Id: I96d903eec0ee9d2fd76e1e3f1ebfd868ad937dbe
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.0_1415828188 82/99382/8
Qt Submodule Update Bot [Wed, 12 Nov 2014 20:23:56 +0000 (22:23 +0200)]
Updated submodules.

Change-Id: Ie8053418e43127327f6df892ae774a1707a9ae97
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agodon't fetch unless we are updating 5.4.0_1415786577 36/99436/2
Oswald Buddenhagen [Mon, 10 Nov 2014 17:10:31 +0000 (18:10 +0100)]
don't fetch unless we are updating

it's just wasting time.

Change-Id: I541cc535c5c95b0140cfa14d7cb042dbe029525e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
5 years agoFix cloning with mirrors 13/99513/2
Kai Koehne [Tue, 11 Nov 2014 14:14:26 +0000 (15:14 +0100)]
Fix cloning with mirrors

Commit 486f5f37761 broke the cloning with one of the mirror options:

git ls-remote git://mirror/qt/qtactiveqt.git.git test/if/mirror/exists
fatal: The remote end hung up unexpectedly

Change-Id: Ia154ee34dd10e35b24676777d8dde98ef0790ee1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
5 years agoFix description of --mirror argument 12/99512/2
Kai Koehne [Tue, 11 Nov 2014 14:01:38 +0000 (15:01 +0100)]
Fix description of --mirror argument

The argument actually requires a trailing slash.

Change-Id: Idc2567746d2b3f4ebf31c2bce5ec683d2a1f425b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
5 years agoteach init-repository about branches 35/99435/2
Oswald Buddenhagen [Mon, 10 Nov 2014 17:08:58 +0000 (18:08 +0100)]
teach init-repository about branches

specifically, add the --branch option and the necessary keys to
.gitmodules.

Change-Id: I09e2df6bd012629f76a35238d66697637bdffe44
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
5 years agoUpdated submodules. 5.4.0_1415600507 90/99190/3
Qt Submodule Update Bot [Fri, 7 Nov 2014 21:24:04 +0000 (23:24 +0200)]
Updated submodules.

Change-Id: I201b4c135a571bdf2621cbac03a9ab46a352b60f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4_1415359679 14/98914/8
Qt Submodule Update Bot [Fri, 7 Nov 2014 03:23:36 +0000 (05:23 +0200)]
Updated submodules.

Change-Id: I201b4c135a571bdf2621cbac03a9ab46a352b60f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4_1415084486 67/98767/3
Qt Submodule Update Bot [Tue, 4 Nov 2014 03:24:26 +0000 (05:24 +0200)]
Updated submodules.

Change-Id: Ica7018cd4f892d0b6938ab276305f6ae02dcc07b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoIgnore alternate if its not a git repo 5.4_1415018110 74/98574/3
Jan Arve Saether [Fri, 31 Oct 2014 10:02:00 +0000 (11:02 +0100)]
Ignore alternate if its not a git repo

Don't just check if the submodule folder exist, since that doesn't
qualify it for being a valid git repo.

Change-Id: Ia3902714a0554908c0b8fd3228ed6fc2cfddd344
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
5 years agoUpdated submodules. 5.4_1414998007 54/98654/7
Qt Submodule Update Bot [Sun, 2 Nov 2014 19:24:04 +0000 (21:24 +0200)]
Updated submodules.

Change-Id: I00e3f00b799e15d95895f70887cf5b1b6d3bc372
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4_1414736354 79/98479/4
Qt Submodule Update Bot [Fri, 31 Oct 2014 03:27:15 +0000 (05:27 +0200)]
Updated submodules.

Change-Id: Ia87766e218ab82cd1da216ea2cd023790fea6e8c
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
5 years agoUpdated submodules. 5.4_1414647636 46/98446/3
Qt Submodule Update Bot [Thu, 30 Oct 2014 03:26:23 +0000 (05:26 +0200)]
Updated submodules.

Change-Id: Ib54838f4a5c3ad05843c680252c45458a4572fb5
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
5 years agoUpdated submodules. 5.4_1414561634 53/98253/4
Qt Submodule Update Bot [Wed, 29 Oct 2014 03:25:09 +0000 (05:25 +0200)]
Updated submodules.

Change-Id: I18cc387deb811a2870842837353d6322511e1872
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
5 years agoUpdated submodules. 5.4_1414475736 99/97999/11
Qt Submodule Update Bot [Tue, 28 Oct 2014 03:23:05 +0000 (05:23 +0200)]
Updated submodules.

Change-Id: I86f7d9ce9873b5c6897e99763aba5765640ceba3
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
5 years agoUpdated submodules. 5.4_1414080186 46/97546/13
Qt Submodule Update Bot [Thu, 23 Oct 2014 11:25:34 +0000 (14:25 +0300)]
Updated submodules.

Change-Id: I3f0739b279123e0a049d52da455f40ad1a20b4ab
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
5 years agofix to let init-repository work on non english locale 5.4_1413545185 33/96833/2
Bruno Coudoin [Sat, 11 Oct 2014 14:16:36 +0000 (16:16 +0200)]
fix to let init-repository work on non english locale

This patch forces the C locale before calling 'git submodule'
in order to get the non localized string 'Entering' that we filter out.

Change-Id: I46d3770956a6b07e574ad15549bbb8942285b800
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
5 years agoUpdated submodules. 33/97433/2
Qt Submodule Update Bot [Fri, 17 Oct 2014 10:09:07 +0000 (13:09 +0300)]
Updated submodules.

Change-Id: Id8a40d65705b36a269accb68f7d82d7ee5fa925f
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
5 years agoUpdated submodules. dev_1413453570
Qt Submodule Update Bot [Thu, 16 Oct 2014 02:36:30 +0000 (05:36 +0300)]
Updated submodules.

Change-Id: I869fce8a6bd6db20b58facdd2a476dacdf3b7d69
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
5 years agoUpdated submodules. 5.4_1413184188 11/96211/17 v5.4.0-beta1
Qt Submodule Update Bot [Mon, 13 Oct 2014 07:04:11 +0000 (10:04 +0300)]
Updated submodules.

Change-Id: I2f80b640ab55f99b2379a41e6ce8c7df30f138a4
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
5 years agoUpdated submodules. 5.4_1412159786
Qt Submodule Update Bot [Wed, 1 Oct 2014 10:29:23 +0000 (13:29 +0300)]
Updated submodules.

Change-Id: Ib927255703d49def6c732f196a6265f6ed08a691
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
5 years agoUpdated submodules. 5.4_1412092402
Qt Submodule Update Bot [Tue, 30 Sep 2014 10:24:10 +0000 (13:24 +0300)]
Updated submodules.

Change-Id: I361f771ae66d1128f407992c228c1c76b0e69e4c
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
6 years agoUpdated submodules. 5.4_1411623916
Qt Submodule Update Bot [Thu, 25 Sep 2014 02:37:12 +0000 (05:37 +0300)]
Updated submodules.

Change-Id: Ie6af514f7185fc618f5093accedfb4f0937e5039
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoAdding qtquick1 and qtwayland also into submodule initialization 41/95641/2
Matti Paaso [Wed, 24 Sep 2014 09:53:46 +0000 (12:53 +0300)]
Adding qtquick1 and qtwayland also into submodule initialization

Without these components, src package creation fails in packaging.

Change-Id: I402c9c49642bccf821c3719206d1dea9415760c6
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
6 years agoUpdated submodules. 5.4_1411540567
Qt Submodule Update Bot [Wed, 24 Sep 2014 02:37:42 +0000 (05:37 +0300)]
Updated submodules.

Change-Id: Ib2e577904b850ea2ba3a8223688b05a21b4921f7
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 years agoUpdated submodules. dev_1410548437
Qt Submodule Update Bot [Fri, 12 Sep 2014 10:46:30 +0000 (13:46 +0300)]
Updated submodules.

Change-Id: Ie3a3e5d05bb46e1f80d1c83d4d3c564040a6ae14
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 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>
6 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>
6 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>
6 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>
6 years agoUpdated submodules. dev_1409682968 16/91816/44
Qt Submodule Update Bot [Tue, 2 Sep 2014 18:35:18 +0000 (21:35 +0300)]
Updated submodules.

Change-Id: Ie073b25926d4c538cb9f41d4c59d171857a60ede
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 years agoSkip not supported modules on wince. dev_1409208791 49/92749/3
Bjoern Breitmeyer [Wed, 20 Aug 2014 12:03:02 +0000 (14:03 +0200)]
Skip not supported modules on wince.

Change-Id: I6ac73c759453813718c6d96c7d6cb27bcbf9815b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>