aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add the GPLv3 license textThiago Macieira2015-08-142-0/+688
| | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Oswald Buddenhagen2015-08-142-3/+3
|\ | | | | | | Change-Id: I5b894e7f72ad81e62a6ea0777e6713dfa36c8a68
| * Merge remote-tracking branch 'origin/5.4.2' into 5.45.4Oswald Buddenhagen2015-08-140-0/+0
| |\ | | | | | | | | | Change-Id: Id8fa6d30810f8bfe46d5aa7e279c69ea560edd19
| | * Merge branch '5.4' into 5.4.2v5.4.2Oswald Buddenhagen2015-05-293-7/+7
| | |\ | | | | | | | | | | | | Change-Id: I33d967b5f668c672a55ad93ac314340453850521
| | * | Updated submodules.Qt Submodule Update Bot2015-05-291-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I670466b6a3ff58edb40c91ff86c443cd6dd20126 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | Updated submodules.Qt Submodule Update Bot2015-05-283-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I07856d73e19b60fbc01ff650cddb1d557db35617 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * | Updated submodules.Qt Submodule Update Bot2015-05-234-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Idfffbfdc266be3f52f716b152bbcb70810127cc9 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | Updated submodules.Qt Submodule Update Bot2015-05-162-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I24f1b3219d1db41acc3f0781fa38f253bcb04da3 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | Updated submodules.Qt Submodule Update Bot2015-05-132-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: If7cb995d04fdc05b35df8b6c5215bf530006b984 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * | Updated submodules.Qt Submodule Update Bot2015-05-093-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I11963ba9f0141fc72dadedffe2c36fba5be16186 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | Updated submodules.Qt Submodule Update Bot2015-05-031-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I39ce0228dad0d141df17ea5f911046130f823467 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | Updated submodules.Qt Submodule Update Bot2015-04-2814-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | Adjust submodule branchesOswald Buddenhagen2015-04-101-29/+29
| | | | | | | | | | | | | | | | Change-Id: Ib30d8a8c4691787c460fe6540b64e2d593422c68
| * | | Updated submodules.Qt Submodule Update Bot2015-06-194-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I00defc7101f1cabc0cc540a84846ec9b7933f599 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | | Updated submodules.Qt Submodule Update Bot2015-05-3114-0/+0
| | |/ | |/| | | | | | | | | | Change-Id: Ib62714f88c3cd381cbbf8758c7b1029c2fa254ed Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Merge tag 'v5.4.1' into 5.4Oswald Buddenhagen2015-05-290-0/+0
| |\ \ | | | | | | | | | | | | Qt 5.4.1 Release
| | * | Updated submodules.v5.4.1Qt Submodule Update Bot2015-02-163-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I0badf6179237bb89ffc57c7387cbf21ebc3b6665 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | Updated submodules.Qt Submodule Update Bot2015-02-144-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I98737b388b9898507bebcd8d05a86e7d916b6d25 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | Updated submodules.Qt Submodule Update Bot2015-02-133-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I9fb1a2e12fb6562c22dbac5fbca06d33046a5030 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | Updated submodules.Qt Submodule Update Bot2015-02-102-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib71478c424ed0a6fd8d058513aa9a68dda71336f Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | Updated submodules.Qt Submodule Update Bot2015-02-065-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I81efb6de3c49e6779556b1d1dfe06f1e1bc574f6 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | Updated submodules.Qt Submodule Update Bot2015-02-0312-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ief1f126ddc66293b041fe5658d57056761eefe05 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | Updated submodules.Qt Submodule Update Bot2015-01-2923-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I0163cb617aa19a26423a716bef23bfc6308aadc6 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | Adjust submodule branchesOswald Buddenhagen2015-01-081-29/+29
| | | | | | | | | | | | | | | | Change-Id: I6f2358370d81238f462d26388d85aa5f74a8b455
| * | | Merge tag 'v5.4.0' into 5.4Oswald Buddenhagen2015-05-290-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Qt 5.4.0 Release
| | * | | Updated submodules.v5.4.0Qt Submodule Update Bot2014-12-055-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1998742ceac59b50864ccec46a6c2f255871ab30 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | | Updated submodules.Qt Submodule Update Bot2014-12-0412-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1885ea72539f3bd2df4d4131f0b164b02d4b59f Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * | | Updated submodules.Qt Submodule Update Bot2014-11-275-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I338ee26271c05b612fc58381270ca471db12aaef Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | | | Updated submodules.Qt Submodule Update Bot2015-05-1431-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I68b5c48282234a27f7c96595c8d84a4dc0bb3871 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | | | Replace old qt-project.org wiki with wiki.qt.ioSergio Ahumada2015-04-163-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9a1114a8b5da649d3da718248fe5df5781810c20 Reviewed-by: Tero Kojo <tero.kojo@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | | | Updated submodules.Qt Submodule Update Bot2015-04-159-0/+0
| | |_|/ | |/| | | | | | | | | | | | | | Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | | 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>