mirror/qt/qt5.git
5 years agoUpdated submodules. dev_1434820518 60/114760/7
Qt Submodule Update Bot [Sat, 20 Jun 2015 10:33:21 +0000 (13:33 +0300)]
Updated submodules.

Change-Id: I3009287ec75bfa7b3084fad32a75552656845434
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. dev_1434604595 23/114023/19
Qt Submodule Update Bot [Thu, 18 Jun 2015 02:33:10 +0000 (05:33 +0300)]
Updated submodules.

Change-Id: I7257e86c7381f5237c2c135a4395e88b65735cd3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. dev_1433826766 39/110939/89
Qt Submodule Update Bot [Tue, 9 Jun 2015 02:33:05 +0000 (05:33 +0300)]
Updated submodules.

Change-Id: I976ffd988e7ec7b595ed610d86bf58307c5e5434
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoMerge remote-tracking branch 'origin/5.5' into dev dev_1429627894 12/110912/1 12/110912/2
Frederik Gladhorn [Tue, 21 Apr 2015 14:26:04 +0000 (16:26 +0200)]
Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
qt3d
qtactiveqt
qtandroidextras
qtbase
qtcanvas3d
qtconnectivity
qtdeclarative
qtdoc
qtenginio
qtimageformats
qtlocation
qtmacextras
qtmultimedia
qtqa
qtquick1
qtquickcontrols
qtrepotools
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwayland
qtwebengine
qtwebkit
qtwebkit-examples
qtwebsockets
qtwinextras
qtxmlpatterns

Change-Id: I691dbbe6d3399d601336bb7e309579fb89d6381c

5 years agoUpdated submodules. 5.5_1428985529 67/110067/11
Qt Submodule Update Bot [Tue, 14 Apr 2015 03:34:21 +0000 (06:34 +0300)]
Updated submodules.

Change-Id: I1d66817cbc1f67e7fd8e2d3f92ec39af344a2f43
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1428557107 45/109945/6
Qt Submodule Update Bot [Thu, 9 Apr 2015 03:34:12 +0000 (06:34 +0300)]
Updated submodules.

Change-Id: I95930e98758f357598c5aaa8fce39ca7f3f549a4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1428402619 47/109747/13
Qt Submodule Update Bot [Tue, 7 Apr 2015 10:28:06 +0000 (13:28 +0300)]
Updated submodules.

Change-Id: I8ad3df2f5d5e93ea8b6e9b823a83e9738f3bf489
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoRemove specific rules for QtWayland 5.5_1427865157 15/109215/2
Caroline Chao [Mon, 23 Mar 2015 12:59:07 +0000 (13:59 +0100)]
Remove specific rules for QtWayland

Let the module handle the platforms by itself.
See QtWayland change: 0448026b4ee75

Change-Id: I622d17d6219e71fb0ad014442763b515e58079af
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
5 years agoUpgrade win_flex/win_bison to 2.5.5 (bison 3.0) 68/109268/4
Andrew Knight [Thu, 26 Mar 2015 04:14:16 +0000 (06:14 +0200)]
Upgrade win_flex/win_bison to 2.5.5 (bison 3.0)

This version is required by upstream ANGLE. win_bison conveniently uses a
different executable name as the existing bison copy, avoiding conflicts.

Change-Id: I2897ce97aef6795933d3ab8b5570a8494a55523e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoUpdated submodules. 31/109431/16
Qt Submodule Update Bot [Wed, 1 Apr 2015 03:34:21 +0000 (06:34 +0300)]
Updated submodules.

Change-Id: Ie0b703ccb7081240278fd803d18d3da11bc3b1b7
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoProspective fix for unnecessary submodule cloning dev_1427450742 40/109440/2
Simon Hausmann [Wed, 25 Mar 2015 11:17:47 +0000 (12:17 +0100)]
Prospective fix for unnecessary submodule cloning

When cloning qtdeclarative, we end up also cloning qtdeclarative-testsuites,
which is not intentional for users of Qt (and init-repository). The init-repository
script checks for the submodule "repo".update key and skips the sub module if the value
is "ignore". However according to the documentation no checkout is to be done if the value
is "none", which is also what qtdeclarative's .gitmodules specifies for the ecmascript
test suite.

Change-Id: Ieb37607ae4ea7c32d6af886d3e2533fb9dea1f13
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoMerge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Jani Heikkinen [Fri, 27 Mar 2015 10:04:06 +0000 (10:04 +0000)]
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev

5 years agoUpdated submodules. 92/106392/76
Qt Submodule Update Bot [Fri, 27 Mar 2015 10:02:51 +0000 (12:02 +0200)]
Updated submodules.

Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1427351088 40/109140/11
Qt Submodule Update Bot [Thu, 26 Mar 2015 04:34:16 +0000 (06:34 +0200)]
Updated submodules.

Change-Id: Icdc3bf5bd941362d1291566b94a67e6d6456a1ad
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1426885101 41/108941/8
Qt Submodule Update Bot [Fri, 20 Mar 2015 20:34:16 +0000 (22:34 +0200)]
Updated submodules.

Change-Id: I43a2c55cdea1098a23221915571445c1d5f23c2b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoMerge remote-tracking branch 'origin/5.5' into dev 83/108983/3 83/108983/4
Oswald Buddenhagen [Fri, 20 Mar 2015 12:07:29 +0000 (13:07 +0100)]
Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I44a6915c1212bb636456368a2b5dc36b9c26fe01

5 years agoUpdated submodules. 5.5_1426683179 70/108570/12
Qt Submodule Update Bot [Wed, 18 Mar 2015 12:34:05 +0000 (14:34 +0200)]
Updated submodules.

Change-Id: I1b9965bf167e4a510bb8662ea11e6ee71a566772
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1426271897 29/107229/35 v5.5.0-alpha1
Qt Submodule Update Bot [Thu, 12 Mar 2015 04:33:53 +0000 (06:33 +0200)]
Updated submodules.

Change-Id: I9a9865ce282d870f755e08438ba187061a41ed9d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoAdded Qt3D as a part of qt5.git default repositories 41/102241/9
Jani Heikkinen [Wed, 17 Dec 2014 12:46:05 +0000 (14:46 +0200)]
Added Qt3D as a part of qt5.git default repositories

Change-Id: I0e74e6c6ab6c347396c449859b1cf24752a42fb8
Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com>
5 years agoMerge remote-tracking branch 'origin/5.4' into 5.5
Oswald Buddenhagen [Mon, 9 Mar 2015 11:28:37 +0000 (12:28 +0100)]
Merge remote-tracking branch 'origin/5.4' into 5.5

5 years agouse git clone --branch instead of --no-checkout 36/107736/1
Oswald Buddenhagen [Wed, 4 Mar 2015 11:03:54 +0000 (12:03 +0100)]
use git clone --branch instead of --no-checkout

git submodule update does not cause an actual checkout if HEAD matches
the recorded submodule sha1 even if it was not actually checked out.

it would be possible to work around this by calling git checkout HEAD in
each submodule if no files are checked out, but that seems hacky.

instead, just make the module cloning already check out the desired
branch. this produces checkouts that are within a few commits of the
final sha1, so isn't too bad.

Change-Id: I435c1a2e24f39fd8c0d65f0d90df0216715668b7

5 years agoMerge remote-tracking branch 'origin/dev' into 5.5
Oswald Buddenhagen [Tue, 3 Mar 2015 10:21:03 +0000 (11:21 +0100)]
Merge remote-tracking branch 'origin/dev' into 5.5

Conflicts:
.gitmodules

Change-Id: I45e015a2c4eb3778d2346569de9b7f09e72a58bf

5 years agoUpdate copyright headers 5.5_1424836211 38/106438/3
Jani Heikkinen [Tue, 17 Feb 2015 10:41:59 +0000 (12:41 +0200)]
Update copyright headers

Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.

Change-Id: Ieb3be34b0d4061fb8dc886991528951f59dbd67e
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
5 years agoUpdated submodules. 46/107046/5
Qt Submodule Update Bot [Tue, 24 Feb 2015 19:24:11 +0000 (21:24 +0200)]
Updated submodules.

Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoAdd qtdeclarative as optional dependency for qtlocation dev_1424155919 98/105698/2
Alex Blasche [Mon, 9 Feb 2015 10:40:06 +0000 (11:40 +0100)]
Add qtdeclarative as optional dependency for qtlocation

Change-Id: Id6d406cd98b64ba111d1eb9cb0b03360a05fbca7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
5 years agoMerge remote-tracking branch 'origin/5.5' into dev
Oswald Buddenhagen [Mon, 16 Feb 2015 15:24:22 +0000 (16:24 +0100)]
Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: Ie7b1685080b978cc1d8790823f79e98e930ca147

5 years agoMerge remote-tracking branch 'origin/5.4' into 5.5
Oswald Buddenhagen [Mon, 16 Feb 2015 15:19:22 +0000 (16:19 +0100)]
Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
qtandroidextras
qtbase
qtconnectivity
qtdeclarative
qtdoc
qtenginio
qtmacextras
qtmultimedia
qtquick1
qtscript
qtsensors
qtserialport
qtsvg
qttools
qtwayland
qtwebchannel
qtwebengine
qtwebkit
qtwebsockets
qtwinextras
qtx11extras
qtxmlpatterns

Change-Id: I98b5e8165cd8575888d18198d8d8e8412e7bfaf0

5 years agoAdjust submodule branches
Oswald Buddenhagen [Mon, 16 Feb 2015 12:05:36 +0000 (13:05 +0100)]
Adjust submodule branches

Change-Id: I952bb9255a393baec2d9ede1cabfca7a47e2dc93

5 years agoUpdated submodules. 5.4_1423914072 46/105646/18
Qt Submodule Update Bot [Sat, 14 Feb 2015 03:23:24 +0000 (05:23 +0200)]
Updated submodules.

Change-Id: Idc93c0d4d7c8e30258fb3ad9f4735e4c9d07457c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. dev_1423842851 16/104916/33
Qt Submodule Update Bot [Fri, 13 Feb 2015 15:06:12 +0000 (17:06 +0200)]
Updated submodules.

Change-Id: I9347499e78f03710eaf24af3c1e7ac650d0ef81d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoAdd qtcanvas3d as submodule 77/105977/9
Pasi Keranen [Wed, 11 Feb 2015 08:04:37 +0000 (10:04 +0200)]
Add qtcanvas3d as submodule

[ChangeLog][General] Added QtCanvas3D module, a JavaScript 3D rendering API for QtQuick.

Change-Id: I9448f87ba8c8ccfb2dd6cf790d29bb561b9e9740
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
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 agoUpdated submodules. 5.4_1423204353 20/102620/69
Qt Submodule Update Bot [Fri, 6 Feb 2015 03:18:54 +0000 (05:18 +0200)]
Updated submodules.

Change-Id: I0163cb617aa19a26423a716bef23bfc6308aadc6
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
5 years agodon't fetch again when updating submodules 41/105441/2
Oswald Buddenhagen [Wed, 4 Feb 2015 20:15:18 +0000 (21:15 +0100)]
don't fetch again when updating submodules

we already did it a moment ago.

this should affect only the --remote case, but there is no harm in
always specifying it.

Change-Id: I3ef0854c790726772fb63ab7829b59ef85ac4f18
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
5 years agodon't checkout when cloning 40/105440/2
Oswald Buddenhagen [Wed, 4 Feb 2015 20:12:57 +0000 (21:12 +0100)]
don't checkout when cloning

we will subsequently do a submodule update with a possibly different
sha1 anyway.

Change-Id: I4950f3727e4263a73c32eff8460962d5796bc5f3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
5 years agomake manual fetching sane 39/105439/2
Oswald Buddenhagen [Wed, 4 Feb 2015 20:20:06 +0000 (21:20 +0100)]
make manual fetching sane

it is in no way said that the remote's HEAD will contain the commit to
be checked out - in fact, it's pretty much guaranteed that it won't for
anything but the default branch. fetching the whole remote avoids
additional roundtrips and makes the --branch feature actually work
reasonably.

Change-Id: I20de2da848b12aea8c5b2784307fe9860252009b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
5 years agoalways check out the target branch when using --branch 88/105288/2
Oswald Buddenhagen [Tue, 3 Feb 2015 16:52:40 +0000 (17:52 +0100)]
always check out the target branch when using --branch

a submodule update with --remote will use the tip of the remote's
branch, but it won't actually switch to the branch if HEAD doesn't point
to it yet.

Change-Id: If13e31da2646683dfb9e832eaab929190acb0167
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
5 years agofix --branch without --no-update 87/105287/2
Oswald Buddenhagen [Fri, 12 Dec 2014 13:00:24 +0000 (14:00 +0100)]
fix --branch without --no-update

clearly, i botched the syntax, but i can't even tell how. that's perl.
the new version is more readable anyway.

Change-Id: Ic3e93c2cf30ee92f368808070899af4b9f7809a3
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
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. 5.4_1419332589 12/102112/19
Qt Submodule Update Bot [Tue, 23 Dec 2014 03:20:15 +0000 (05:20 +0200)]
Updated submodules.

Change-Id: I9ca0c5251312fbb7b83264eff28ef98287c7f70d
Reviewed-by: Jani Heikkinen <jani.heikkinen@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 agoUpdated submodules. 5.4_1418629460 14/101314/25
Qt Submodule Update Bot [Sun, 14 Dec 2014 19:56:50 +0000 (21:56 +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>
6 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>
6 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>
6 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

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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>