summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated submodules.Liang Qi2015-12-1531-0/+0
| | | | | Change-Id: I54527e1c5ad138ac63d38d8eabcf158d11b0286d Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Updated submodules.Qt Submodule Update Bot2015-09-2133-0/+0
| | | | | Change-Id: I1d3966833b5f27fb262f2d3727557ef2c8947828 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into devOswald Buddenhagen2015-09-1872-55231/+43
|\ | | | | | | | | | | | | | | | | Conflicts: .gitmodules qtquickcontrols2 qtwebview Change-Id: Ic5b78f36511d5e022aacd6ade5d052345bc84d14
| * Updated submodules.Simon Hausmann2015-09-1722-0/+0
| | | | | | | | | | Change-Id: I03bbaedeb88ad76df39ce10f6828ebf5c8b8dadf Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.5' into 5.6Oswald Buddenhagen2015-09-102-0/+0
| |\ | | | | | | | | | Change-Id: I7a28bcaeb5538763274fdef20f8c8ca81b9b21ad
| | * Updated submodules.Qt Submodule Update Bot2015-09-048-0/+0
| | | | | | | | | | | | | | | Change-Id: I0ba6e6ce435be779865b0ace08d74dd29800be9c Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * gnuwin32: remove win_bison/win_flexAndrew Knight2015-09-012-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | These tools are copies of bison/flex and are no longer needed. Change-Id: Ia543926ee8126358beee2aed03752d9cfe803f07 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| | * Updated submodules.Qt Submodule Update Bot2015-09-0110-0/+0
| | | | | | | | | | | | | | | Change-Id: I1497a398e34e18abb18f705b2294464840629ca1 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * Updated submodules.Qt Submodule Update Bot2015-08-254-0/+0
| | | | | | | | | | | | | | | Change-Id: I56e7af096e889d56ef67baabf38529c0ccb8d8b5 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | Add QtQuickControls2 as submodulev5.6.0-alpha1Frederik Gladhorn2015-09-033-0/+6
| | | | | | | | | | | | | | | Change-Id: I435fb765b48a978763384226e399b33448a40502 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * | Hook qtserialbus into qt5.gitAlex Blasche2015-09-033-0/+5
| | | | | | | | | | | | | | | Change-Id: I17c8c55205f852b3e79f279cad7b87f403d7fbe7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | Add qtwebview as submoduleFrederik Gladhorn2015-09-033-0/+6
| | | | | | | | | | | | | | | | | | Change-Id: I6a69b08945767f4cb8f4164630c726cf8bf552bb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | Removed QtWebkit and QtWebkit-Examples from qt5.gitJani Heikkinen2015-09-033-15/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebkit (and QtWebkit-Examples) were deprecated in Qt 5.5 and will now be removed from qt5.git in Qt5.6 release Change-Id: I86e1072141956136fa5e4220cdcdf812492453b3 Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * | Fix QtEnginio branchSimon Hausmann2015-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The 1.3 branch does not exist anymore, let's use 5.6 Change-Id: I442ad45c73a0e08c853385c999dddf818447bb82 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * | Updated submodules.Simon Hausmann2015-09-0332-0/+0
| | | | | | | | | | | | | | | Change-Id: Ie8c296b8e64fe0083ab5ec1584a42c7165fbe3ab Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | Remove quick1 from default checkoutJani Heikkinen2015-08-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | QtQuick1 was deprecated in Qt 5.5 and will now be removed from default modules in qt5.git Change-Id: I88aa9d75ace8d91b4cd469d7511662425e67d95f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-08-2467-55215/+24
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qt3d qtactiveqt qtandroidextras qtbase qtcanvas3d qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats qtlocation qtmacextras qtmultimedia qtqa qtquick1 qtquickcontrols qtrepotools qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwayland qtwebchannel qtwebengine qtwebkit qtwebkit-examples qtwebsockets qtwinextras qtx11extras qtxmlpatterns Change-Id: I7410d9be5775ab276fb5a57adb397f4f92d77a50
| | * Updated submodules.Qt Submodule Update Bot2015-08-2120-0/+0
| | | | | | | | | | | | | | | Change-Id: Icf1e00c471aea0ce5228165735195a9f0f76fe36 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * Updated submodules.Qt Submodule Update Bot2015-08-1831-0/+0
| | | | | | | | | | | | | | | Change-Id: Id60882b0bc98875361477cb5aaf7d12c2693f900 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * 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>