aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | Updated submodules.Qt Submodule Update Bot2015-04-0925-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | | | Add qtgraphicaleffects as an optional dependency for qtquickcontrols.Mitch Curtis2015-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a prerequisite to making qtgraphicaleffects a dependency in qtquickcontrols' sync.profile. Task-number: QTBUG-46393 Change-Id: I3679392a7feb48ecefa4a01a7ecb42b2e6287ecb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * | | | gnuwin32: Remove old versions of bison/flex from the distributionAndrew Knight2015-08-1360-55879/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The win_flex/win_bison tools are already in the repository and working with all projects, so the GnuWin32 versions can be removed and the winflexbison versions can take their place. Task-number: QTBUG-46852 Change-Id: I41bc541adab834ff83912d7a4f076a87fc174601 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-08-1310-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idbdb4ce40f9456898ac9148dc08473f636f34f1d Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-08-0721-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I20beccb62815f3c6948d888ccfad0b69c42b55e0 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-07-146-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie77fe47fcec71a13d3640059d1e0ce66a47fc0b2 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-07-1113-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I22c7d89fd93a256c4051f49b9a9b89789e697df6 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-06-304-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ideafacc193da59a1db25e006b16630b74535cbee Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * | | | README: Replace qt-project.org with qt.ioKai Koehne2015-06-301-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iacc4dc8f28ce2c0bb1d761834d0f90b444f47327 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-06-2931-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibc862a8b12e46042819341229b31883bc9a1462e Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * | | | Add qtquickcontrols as an optional dependency to qtlocation moduleAaron McCarthy2015-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the correct modules checked out 'make module-qtlocation' will build everything necessary to run the examples. Change-Id: I0c63221b5704c2b13495f3dc3221e888d8e9547c Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-06-264-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie231e8be72006172dd80ec9f1df8f57e7fc54891 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-06-255-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icc425a6784ea3ae379716ddb1e79a8a07ccd8d74 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-06-2410-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I88f32b10ee95f967686bf9c3295887b4ebb62eba Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-06-206-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibc644efc00d00f43c1d202106bae6facf015c7fb Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-06-1715-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia820c1611af25853deb8161041adf39b7bfa61db Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-06-072-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5384ff79efab1a68cfb665f1e764d7f5ee73fcba Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * | | | qtdeclarative is an optional dependency for qtwebkitMichael Olbrich2015-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way qtwebkit can be built when qtdeclarative is disabled. This is especially useful for targets without OpenGL. Also add qtxmlpatterns to the optional dependencies. It was an indirect dependency before via qtdeclarative. Change-Id: Ib4c29b958bd63d528fba8ec326e2dbc1ea8bce08 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-06-0414-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4fc367abe95ee78166067047d0f229bba9991956 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-05-3110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I88af8ac70704e63a2154b3fe22b51483a69d84c3 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-05-2914-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I57641bf25f49f0f8eb55ccb08a4ede2d6a7af499 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | | | Set win_bison/win_flex executableAndrew Knight2015-05-272-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes failed execution when the Qt sources are exported to Windows over a network share or attempted to be executed on a Linux system using binfmt. Change-Id: I00b1073e516d2441498a39cc13e4295484e1ef9d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-05-2726-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I31ee12ede4defe80e20dd49b9ca7b425b6758965 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-05-1912-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I833cf03a1efe7ef6fa8f11020826063804ebddaa Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-05-1515-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I619984c9c8d142c465bb86a571d101ac564676d2 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-05-0911-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I56a80384b1c5fef07b53d41bcc8567177f6f43db Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-05-0715-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I359f9925da5f735a654ab18efbc68305f5dadfd2 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | | | Updated submodules.v5.5.0-beta1Qt Submodule Update Bot2015-05-037-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic38d3b26e9a53fb6b0671ebfdbd05f6a925fe668 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-04-294-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0d362ee5568abc3943a83b10ae8b6444103ff8c3 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | | | Updated submodules.Qt Submodule Update Bot2015-04-2825-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I976ffd988e7ec7b595ed610d86bf58307c5e5434 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | | | | fix qtcanvas3d submodule referenceOswald Buddenhagen2015-08-122-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I67d89f5e8d04a1e60ff0aedc33e29da7a58df620
| * | | | | Adjust submodule branchesOswald Buddenhagen2015-08-101-31/+31
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I7755bb88167297aef9defaa6b66639fde6e9804d
* | | | | Updated submodules.Qt Submodule Update Bot2015-07-1124-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idc11a328839163ffae5e72f2e43860b12f19c668 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | | | Updated submodules.Qt Submodule Update Bot2015-06-252-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic5910fb0b28553d1eb0815e578381fd358e342fc Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | | | Updated submodules.Qt Submodule Update Bot2015-06-235-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic5e879665945d79c0fcdb27c2c00978b7abdeef6 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | | | Updated submodules.Qt Submodule Update Bot2015-06-211-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5c321f6626e9bf6f64f2c120e8281547e2561880 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | | | Updated submodules.Qt Submodule Update Bot2015-06-205-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3009287ec75bfa7b3084fad32a75552656845434 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | | | Updated submodules.Qt Submodule Update Bot2015-06-1810-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7257e86c7381f5237c2c135a4395e88b65735cd3 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | | | | 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
|\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 00:48:52 +0000