summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated submodules.Qt Submodule Update Bot2015-06-0932-0/+0
| | | | | Change-Id: I976ffd988e7ec7b595ed610d86bf58307c5e5434 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-04-2127-1/+16432
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Updated submodules.Qt Submodule Update Bot2015-04-1412-0/+0
| | | | | | | | | | Change-Id: I1d66817cbc1f67e7fd8e2d3f92ec39af344a2f43 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2015-04-099-0/+0
| | | | | | | | | | Change-Id: I95930e98758f357598c5aaa8fce39ca7f3f549a4 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2015-04-0713-0/+0
| | | | | | | | | | Change-Id: I8ad3df2f5d5e93ea8b6e9b823a83e9738f3bf489 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * Remove specific rules for QtWaylandCaroline Chao2015-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | 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>
| * Upgrade win_flex/win_bison to 2.5.5 (bison 3.0)Andrew Knight2015-04-0126-0/+16431
| | | | | | | | | | | | | | | | 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>
| * Updated submodules.Qt Submodule Update Bot2015-04-0116-0/+0
| | | | | | | | | | Change-Id: Ie0b703ccb7081240278fd803d18d3da11bc3b1b7 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2015-03-2619-0/+0
| | | | | | | | | | Change-Id: Icdc3bf5bd941362d1291566b94a67e6d6456a1ad Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2015-03-2018-0/+0
| | | | | | | | | | Change-Id: I43a2c55cdea1098a23221915571445c1d5f23c2b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Prospective fix for unnecessary submodule cloningSimon Hausmann2015-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/devJani Heikkinen2015-03-278-78/+56
|\ \
| * \ Merge remote-tracking branch 'origin/5.5' into devOswald Buddenhagen2015-03-208-78/+56
| |\ \ | | |/ | | | | | | Change-Id: I44a6915c1212bb636456368a2b5dc36b9c26fe01
| | * Updated submodules.Qt Submodule Update Bot2015-03-1822-0/+0
| | | | | | | | | | | | | | | Change-Id: I1b9965bf167e4a510bb8662ea11e6ee71a566772 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * Updated submodules.v5.5.0-alpha1Qt Submodule Update Bot2015-03-1324-0/+0
| | | | | | | | | | | | | | | Change-Id: I9a9865ce282d870f755e08438ba187061a41ed9d Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * Added Qt3D as a part of qt5.git default repositoriesJani Heikkinen2015-03-132-0/+1
| | | | | | | | | | | | | | | Change-Id: I0e74e6c6ab6c347396c449859b1cf24752a42fb8 Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com>
| | * Merge remote-tracking branch 'origin/5.4' into 5.5Oswald Buddenhagen2015-03-091-3/+4
| | |\
| | | * use git clone --branch instead of --no-checkoutOswald Buddenhagen2015-03-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Merge remote-tracking branch 'origin/dev' into 5.5Oswald Buddenhagen2015-03-031-1/+1
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I45e015a2c4eb3778d2346569de9b7f09e72a58bf
| | * | Update copyright headersJani Heikkinen2015-02-257-75/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | Updated submodules.Qt Submodule Update Bot2015-02-2530-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | | | Updated submodules.Qt Submodule Update Bot2015-03-2734-0/+0
|/ / / | | | | | | | | | | | | Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | | Add qtdeclarative as optional dependency for qtlocationAlex Blasche2015-02-171-1/+1
| | | | | | | | | | | | | | | Change-Id: Id6d406cd98b64ba111d1eb9cb0b03360a05fbca7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devOswald Buddenhagen2015-02-161-15/+28
|\ \ \ | |/ / | | | | | | Change-Id: Ie7b1685080b978cc1d8790823f79e98e930ca147
| * | Merge remote-tracking branch 'origin/5.4' into 5.5Oswald Buddenhagen2015-02-161-15/+28
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Updated submodules.Qt Submodule Update Bot2015-02-1423-0/+0
| | | | | | | | | | | | | | | Change-Id: Idc93c0d4d7c8e30258fb3ad9f4735e4c9d07457c Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * Updated submodules.Qt Submodule Update Bot2015-02-0631-0/+0
| | | | | | | | | | | | | | | Change-Id: I0163cb617aa19a26423a716bef23bfc6308aadc6 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * don't fetch again when updating submodulesOswald Buddenhagen2015-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * don't checkout when cloningOswald Buddenhagen2015-02-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | we will subsequently do a submodule update with a possibly different sha1 anyway. Change-Id: I4950f3727e4263a73c32eff8460962d5796bc5f3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * make manual fetching saneOswald Buddenhagen2015-02-061-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * always check out the target branch when using --branchOswald Buddenhagen2015-02-061-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * fix --branch without --no-updateOswald Buddenhagen2015-02-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Updated submodules.Qt Submodule Update Bot2014-12-2319-0/+0
| | | | | | | | | | | | | | | Change-Id: I9ca0c5251312fbb7b83264eff28ef98287c7f70d Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * Updated submodules.Qt Submodule Update Bot2014-12-1530-0/+0
| | | | | | | | | | | | | | | Change-Id: Ia68a6b964f770fef3ea3d52f29d0c7a86186e80c Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | Adjust submodule branchesOswald Buddenhagen2015-02-161-31/+31
|/ / | | | | | | Change-Id: I952bb9255a393baec2d9ede1cabfca7a47e2dc93
* | Updated submodules.Qt Submodule Update Bot2015-02-1327-0/+0
| | | | | | | | | | Change-Id: I9347499e78f03710eaf24af3c1e7ac650d0ef81d Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Add qtcanvas3d as submodulePasi Keranen2015-02-133-0/+6
| | | | | | | | | | | | | | | | [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>
* | QtWebEngine: add dependency on QtWebChannelPierre Rossi2015-02-112-1/+1
| | | | | | | | | | | | | | | | | | | | 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>
* | QtLocation doesn't depend on QtMultimedia anymore.Alex Blasche2015-02-041-1/+1
| | | | | | | | | | Change-Id: Id75a7fc591064639a38694149517924dd33b56fb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Updated submodules.Qt Submodule Update Bot2015-01-2933-0/+0
| | | | | | | | | | Change-Id: I25db2aa87f437c03d7929959c3e6d94d9fc0d541 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Qt3D depends upon qtimageformats moduleSean Harmer2014-12-301-1/+1
| | | | | | | | | | | | | | | | 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>
* | Updated submodules.Qt Submodule Update Bot2014-12-1827-0/+0
| | | | | | | | | | Change-Id: Ia68a6b964f770fef3ea3d52f29d0c7a86186e80c Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | adjust submodule branch names for dev branchOswald Buddenhagen2014-12-051-29/+29
| | | | | | | | | | Change-Id: I65ea644943aa345b8f0fd1d5fcdfccf8f86ed914 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devOswald Buddenhagen2014-12-059-893/+672
|\ \ | |/ | | | | | | Change-Id: Ia8938b7bb2c0393c1799b64309c3cadc7293ad8e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2014-12-0216-0/+0
| | | | | | | | | | Change-Id: I968f8a2a5ef20c47184d15b8f9e92a795176fcb2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * adjust submodule branch names for 5.4 branchOswald Buddenhagen2014-12-021-29/+29
| | | | | | | | | | | | Change-Id: I1621fee44becf1940d7d50a604fa8c91f3be78d9 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.4.0' into 5.4Oswald Buddenhagen2014-11-252-7/+67
| |\ | | | | | | | | | Change-Id: I5b2910fc4e8fece8fad42eb200ed6dffdd24f751
| | * Updated submodules.Qt Submodule Update Bot2014-11-257-0/+0
| | | | | | | | | | | | | | | Change-Id: I77f387bc89c06d870b7d41516734ee3f1c68e71a Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * Updated submodules.v5.4.0-rc1Qt Submodule Update Bot2014-11-214-0/+0
| | | | | | | | | | | | | | | Change-Id: I7c0bc2305680fac216bbaa72ac83f65b04feffff Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * Updated submodules.Qt Submodule Update Bot2014-11-203-0/+0
| | | | | | | | | | | | | | | Change-Id: I4b199501287c5a5961405ae0667c04dc1188af44 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>