aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| | * Updated submodules.Qt Submodule Update Bot2014-11-1911-0/+0
| | | | | | | | | | | | | | | Change-Id: I96d903eec0ee9d2fd76e1e3f1ebfd868ad937dbe Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * Updated submodules.Qt Submodule Update Bot2014-11-1214-0/+0
| | | | | | | | | | | | | | | Change-Id: Ie8053418e43127327f6df892ae774a1707a9ae97 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * don't fetch unless we are updatingOswald Buddenhagen2014-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | it's just wasting time. Change-Id: I541cc535c5c95b0140cfa14d7cb042dbe029525e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| | * Fix cloning with mirrorsKai Koehne2014-11-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Fix description of --mirror argumentKai Koehne2014-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | The argument actually requires a trailing slash. Change-Id: Idc2567746d2b3f4ebf31c2bce5ec683d2a1f425b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * teach init-repository about branchesOswald Buddenhagen2014-11-122-4/+65
| | | | | | | | | | | | | | | | | | | | | | | | specifically, add the --branch option and the necessary keys to .gitmodules. Change-Id: I09e2df6bd012629f76a35238d66697637bdffe44 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2014-11-105-0/+0
| | | | | | | | | | | | | | | Change-Id: I201b4c135a571bdf2621cbac03a9ab46a352b60f Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | Updated submodules.Qt Submodule Update Bot2014-11-2012-0/+0
| | | | | | | | | | | | | | | Change-Id: Icafd720586cfe92d6e5773d553f6e70594f6c7dc Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | Updated submodules.Qt Submodule Update Bot2014-11-0712-0/+0
| |/ | | | | | | | | Change-Id: I201b4c135a571bdf2621cbac03a9ab46a352b60f Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2014-11-048-0/+0
| | | | | | | | | | Change-Id: Ica7018cd4f892d0b6938ab276305f6ae02dcc07b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * Ignore alternate if its not a git repoJan Arve Saether2014-11-031-1/+1
| | | | | | | | | | | | | | | | 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>
| * Updated submodules.Qt Submodule Update Bot2014-11-037-0/+0
| | | | | | | | | | Change-Id: I00e3f00b799e15d95895f70887cf5b1b6d3bc372 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2014-10-318-0/+0
| | | | | | | | | | Change-Id: Ia87766e218ab82cd1da216ea2cd023790fea6e8c Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * Updated submodules.Qt Submodule Update Bot2014-10-309-0/+0
| | | | | | | | | | Change-Id: Ib54838f4a5c3ad05843c680252c45458a4572fb5 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * Updated submodules.Qt Submodule Update Bot2014-10-2911-0/+0
| | | | | | | | | | Change-Id: I18cc387deb811a2870842837353d6322511e1872 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * Updated submodules.Qt Submodule Update Bot2014-10-2814-0/+0
| | | | | | | | | | Change-Id: I86f7d9ce9873b5c6897e99763aba5765640ceba3 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * Updated submodules.Qt Submodule Update Bot2014-10-2316-0/+0
| | | | | | | | | | Change-Id: I3f0739b279123e0a049d52da455f40ad1a20b4ab Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * fix to let init-repository work on non english localeBruno Coudoin2014-10-171-0/+2
| | | | | | | | | | | | | | | | 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>
| * Updated submodules.Qt Submodule Update Bot2014-10-1723-0/+0
| | | | | | | | | | Change-Id: Id8a40d65705b36a269accb68f7d82d7ee5fa925f Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| * Updated submodules.v5.4.0-beta1Qt Submodule Update Bot2014-10-1323-0/+0
| | | | | | | | | | Change-Id: I2f80b640ab55f99b2379a41e6ce8c7df30f138a4 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| * Updated submodules.Qt Submodule Update Bot2014-10-019-0/+0
| | | | | | | | | | Change-Id: Ib927255703d49def6c732f196a6265f6ed08a691 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 06:41:09 +0000