aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-11-251-1/+1
| | | | | | | | | | | | | | | Change-Id: I4c2e27810759e99503dad9f8b6b0e75fcdb5c804 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-11-211-1/+1
| | | | | | | | | | | | | | | Change-Id: Id256fe2f9fe1d70ff88f383f0eaf87a70fe3da48 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-11-131-1/+1
| | | | | | | | | | | | | | | Change-Id: Id5a115548dc961ab40bf2b235bb61469a53cb8ae Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-11-121-1/+1
| | | | | | | | | | | | | | | Change-Id: Ib390e0b5ada59cf04056d647b518534fe295f290 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-121-0/+20
|\| | | | | | | | | | | Change-Id: I5ff0644332a9fda26a8157f97d2f7f50459815e2
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
| |\| | | | | | | | | | Change-Id: Ia47454049dad96db07696e400b9b48b3c31ad316
| | * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-rc1v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8a8a5ceaf4122dffdf5d8a7ed8ade6e21289899b
| | | * Add changes file for Qt 5.13.2v5.13.25.13Antti Kokko2019-10-141-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | + bf2fe74afe29fb5bb1b39943f7c5c8a106ae47ee Add changes file for Qt 5.12.5 Change-Id: Icf2ac8b90ee2817483947f3df9c82023178cf60e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ic22eb1493f2a77d752775c59e5355ab5415e0b68
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I470d2f0908515e942c3b21d55f429808944b9ebf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie672dc3107822ca7b80171a018ce6659e0164066 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic010eb63957867d0d9d261f3193b0b4fb8a97a25 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia755226f30d660e8abf095291a4ff68e97686c68 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I4ee1c6353c55829e379fc9edf89ad0a884e0ca74 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Icea374cc1c28a485303f62a253d821314574955e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I36869bd97cf44df10114c9380205565330105ace Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifcf24625bc9ee805516fa6ef7b8b18499386a15e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic1d56f62ed374dc8a6c618461cf1e5b33d81bfca Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I32dcba134e360df80848e166f9464da842681e78 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Id302fbc5363b23352e65a773f3d428c0582d8198 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I2f0495e3d05155c67f8ca9d8789db3bcb81fb5c4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Icb8d864f58cfa8d6cb801ad1b2faff6f07c43e08 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I8942d286c1c3d8a1c5df807191772d80cea510ad Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I4552b56a34012514a57fb4ea407c4be1c059bccb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I36c337b66211d6bd2240ad5e3fbd5bb0f836f87c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie5fcae8f0041d64c3bc6b1279b7f97304021a523 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie9d9a915ff7570823bdc64430111432684a6975c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Id38ba96af605a01882efd77abe86a1a050d92293 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I79d6b04c2ecfaa7baf5f7a2270cf7af790b0f70e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic4d511758904cfa6e8068c12116ffd32931f07ca Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I3dd1a79a00822d135ac8ef4862c917d820c2d226 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-09-282-0/+40
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-282-0/+40
|/| | | | | |/ / / | | | | | | | | Change-Id: I4ddd9b3630c955461168c218c4154e7ed42981b7
| * | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-212-0/+40
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-212-0/+40
| |/| | | | | |/ / | | | | | | | | Change-Id: Ie299d429a2d30450bcdad896e5fd4c41f42a9540
| | * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta2v5.14.0-beta1v5.14.0-alpha1Qt Forward Merge Bot2019-09-172-0/+40
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-172-0/+40
| | |/| | | | | |/ | | | | | | | | Change-Id: I7f7dd441191a6f4292d8d6d9f9be29529ecacea6
| | | * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+20
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| | | |/| | | | | | | | | | | | | | | | Change-Id: Ib922d763295ac408dcbd9e8d6f2a54b0d2e4c5fc
| | | | * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+20
| | | | |\
| | | | | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
| | | | |/| | | | | | | | | | | | | | | | | | | Change-Id: I65eb04be73ed2f68aa4cf7faa83528096219b0cd
| | | | | * Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-08-261-0/+20
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 3247a8f30ef1aa26fefc5d8b8f81f35567bf0071 Bump version Change-Id: I7c522367fad2dbebf6965f18f95ca647258b4e7d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
| | | |\ \
| | | | * | Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| | | |/| | | | | | | | | | | | | | | | | | | | Change-Id: Ic93adb1ca4b0d79333a738dc371bd3f7c73070c1
| | | | * | Add changes file for Qt 5.13.1v5.13.1Antti Kokko2019-07-301-0/+20
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 9e6f9ab815a554c74ac5beb58d949eef84b36e41 Bump version + 98fd0eb0f72f18fc4eca16137566ea6ca3479c71 Add changes file for Qt 5.12.4 + 7abc8c2805797b6361af34676ac0484b2682aedf Bump version + 3247a8f30ef1aa26fefc5d8b8f81f35567bf0071 Bump version + dbc3f50ae7cb9cc2c3f0b5689441bf269cfed01d Doc: Replace example file lists with links to code.qt.io + f44061fa0547d048661d1efa8444da7c757fa39c Doc: Ensure macOS-specific class docs are generated on other platforms Change-Id: I68650896ffe966902076eb8332b2f6f19562fe41 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | | | Update dependencies on 'dev' in qt/qtmacextrasQt Submodule Update Bot2019-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic7005b75d992e538cf255e8873b5fba1263414e4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Merge "Merge remote-tracking branch 'origin/wip/qt6' into dev"Simon Hausmann2019-09-181-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-09-181-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8810e1cd86f9d4a58b3f56322a7d68f827f10e03
| | * | | | | Revert "Re-add dependencies.yaml now that qt5.git wip/qt6 builds fine"Alexandru Croitor2019-08-281-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 65c3d3846962cf50e1e73de94eb1526df9f2629d. As discussed we shouldn't use the files until we have an easier mechanism for updating in place. Change-Id: I8c32340fc53633160a2ebdbe1dca6de21e4890bd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | | | Re-add dependencies.yaml now that qt5.git wip/qt6 builds fineAlexandru Croitor2019-08-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If5334e1b8df6002985fa30af6fc89f6f0a4bfed0 Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>