Conflicts:
	.qmake.conf

Change-Id: I3bd0be818ed7f363da3b1da2c3a78a78180a9d18

Change-Id: I8259491271a30ab90ff0a2e3bb10f96b2a3ed2c4

Change-Id: I4e1058662d82158d486d171072d967af00490e13

Relevant updates and cleanup for the existing modules.

Change-Id: I0e70aca2b7d5e5f8e550dbcf92ec1b87a04eb0c8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Change-Id: If564bc735d31cbf5c64d6af7464c4bae18f02f64

Change-Id: I21ea10a160c2555eaf4da0da5eaeb08b49e4a922
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

it was apparently forgotten.

Change-Id: Iee8ebb488856fe7193c86f7fcbc86a5c2b580af9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

Change-Id: I89fc31f57ef12f258c886cd63d62faf972008470
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771



Change-Id: I6f8cf005899b8bf9ca0733a3356aa57b7e0700e8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

This contains Catalan translation updates for Qt 5.6 branch

Change-Id: I3090bb020a7af2da76439c38416290d5b123f392
Reviewed-by: Albert Astals Cid <aacid@kde.org>
Reviewed-by: Josep Ma. Ferrer <txemaq@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Change-Id: I1c8af007df5884f4acb687004e6fcdf2fcfc1e14
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Conflicts:
	.qmake.conf

Change-Id: Id643be8c78e9143b0b1c8afa7ad4da9cf7f67d7e

Change-Id: Ic534e5c711af426e1d1ec60fa276d45666e824a4
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

Change-Id: Ia4cf019710894489c59c235095c6834164ddab4d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Change-Id: I5628eeb28a07949cc9e215903ca8aac044f68449
Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Change-Id: I6d658c796315fe092e9835bc586a7b767a1ad476

Change-Id: Iaff94be7e04cc6788e3ac80552a7c57dd69fe07f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Change-Id: I1bbf3bbecbfe121a5cb834eafc1965549d5bcb56
Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Change-Id: Ic34cb2bf262abf7f8980fd46251523279dbca5a6
Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Change-Id: Id0ae49e28a2cb0be8e24da3ddf967a4c89493223
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>

Change-Id: I15a666feedb31cdc70a6115ed322cea7197eb62f
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

instead, silently ignore them - they typically stem from missing
repositories (usually, the obsolete ones).

Change-Id: Iaec00f8e88e4977bd820d1b8c3b5b8d5be30c72b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

Change-Id: I425892e7d4d9fa73f6dc23be4f4aa4cbf8d0cc95

Change-Id: I8f84c74517a21a42ae19ed3ce407a6032757b9c3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Change-Id: I24c3de89226c2971bf7e59f7599bd83890e94c7f

Change-Id: I135757965284ec3d426fd6c87eba1b75f88c172f

Task-number: QTBUG-43447
Change-Id: I0b5850569abd54772df0e8db6ab3e19490f83e23
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Change-Id: I83ce3a386f36bd61a2bb74bb4446edd35aa54ded
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Change-Id: Ifdf791da77dd23a360a32c6477b19994065ba9a3
Reviewed-by: Aki Koskinen <qt@akikoskinen.info>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Updated: qtbase, assistant, designer, linguist, qtdeclarative,
        qtmultimedia, qtquickcontrols
Added: qtserialport, qtwebsockets

Change-Id: I41877e7d81206b737a702c13d01846fc1335beb0
Reviewed-by: Naoki Matsumoto <nekomatu@gmail.com>
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Takayuki ORITO <iori.ayane@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Change-Id: I3f7a79bafc8d98feef99c60af638110c23a2d50c
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Change-Id: If150bbba4871729c8ee9e4c510e0ee9b12ed74a8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Genghis Khan <genghiskhan@gmx.ca>

Change-Id: Ic766732a1516adb4b0ff8987d3e64664200f0f03
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Commit aabb8330

 introduced _en.ts files that are auto-generated
in the build directory. However, $$files() in this case returns
absolute paths, which the text substition rules later on adds again.

Fix this by first removing the absolute path.

Task-number: QTBUG-49337
Change-Id: I245010121893e58145e43593b50a4e8209740ff0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>

Change-Id: Icefeaeb2918aeeffe5c3a4109783c005481eac3d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Change-Id: I984770b869d735bc4d7cbd99242e944a47d588c0

- Add auto-generated _en.ts files to .gitignore.
- Let git do the globbing by passing the pattern on to git so that
  git add will not bail out with error when encountering
  a file listed in .gitignore.

Task-number: QTBUG-48075
Change-Id: I2ab328a9ef4574e15742af2dafecda52f795685a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

Change-Id: I57942be40e9202753264a156cb21db142329578f

Change-Id: I31b78e8f66651ed4d27f5208a88ed62dcfd03a94

Change-Id: I5c1b63a0df3bc6d710eaddc91784d6c602631ae7
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>