Change-Id: Ibe35b9f9


Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

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

Change-Id: I952bb9255a393baec2d9ede1cabfca7a47e2dc93

Change-Id: Idc93c0d4


Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

Change-Id: I9347499e


Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

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

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>

Change-Id: I0163cb61


Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

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>

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

Change-Id: I4950f3727e4263a73c32eff8460962d5796bc5f3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

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>

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>

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>

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

Change-Id: I25db2aa8


Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

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>

Change-Id: I9ca0c525


Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

Change-Id: Ia68a6b96


Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

Change-Id: Ia68a6b96


Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

Change-Id: I65ea644943aa345b8f0fd1d5fcdfccf8f86ed914
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

Change-Id: Ia8938b7bb2c0393c1799b64309c3cadc7293ad8e
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

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 d870bd65

.

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

Change-Id: I968f8a2a


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

Change-Id: I1621fee44becf1940d7d50a604fa8c91f3be78d9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>

Change-Id: I5b2910fc4e8fece8fad42eb200ed6dffdd24f751

Change-Id: I77f387bc


Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

Change-Id: I7c0bc230


Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

Change-Id: Icafd7205


Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

Change-Id: I4b199501


Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

Change-Id: I96d903ee


Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

Change-Id: Ie8053418


Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

it's just wasting time.

Change-Id: I541cc535c5c95b0140cfa14d7cb042dbe029525e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>

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>

The argument actually requires a trailing slash.

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

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

Change-Id: I09e2df6bd012629f76a35238d66697637bdffe44
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

Change-Id: I201b4c13


Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

Change-Id: I201b4c13


Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

Change-Id: Ica7018cd


Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

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>

Change-Id: I00e3f00b


Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>