summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.1' in qt/qttranslations6.1Qt Submodule Update Bot2021-10-011-1/+1
| | | | | Change-Id: I6c5cf9ba2a7cc8e0acc57ba6f427d55bda54b358 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-09-291-1/+1
| | | | | Change-Id: I1d96ace99f2d08f22843b57aa9b6968e0362af13 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-09-281-1/+1
| | | | | Change-Id: I4af5ecbf87992e2e5e2e3745c94fc883bb552cb2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-09-231-1/+1
| | | | | Change-Id: I00ea24cd088a41ade696534c2d7bd18f21a8b184 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-09-141-1/+1
| | | | | Change-Id: I2187765fe1163349ba831f605547ce6160488adf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-09-031-1/+1
| | | | | Change-Id: I17d6ee8ff6ddbe8728f1c470b5aa3c43d14ddf64 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-09-031-1/+1
| | | | | Change-Id: I01c43aacd195553a8ab982e93ec487c7e329622a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-08-311-1/+1
| | | | | Change-Id: I98508ddea9b126f4580d9ea44525219b940b6559 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-08-311-1/+1
| | | | | Change-Id: Id0d9a87fa109b0d783234e0fc0422cc045e176d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-08-201-1/+1
| | | | | Change-Id: I0f62e9a1a9c4db08e901af57952774e93aeff17a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-08-181-1/+1
| | | | | Change-Id: Ib1c8c93b0888dc600e3c8447f15dd2e0a6ff6a2d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-08-141-1/+1
| | | | | Change-Id: I7db2017003c80fef3221114281809b224f958735 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-08-131-1/+1
| | | | | Change-Id: Ifecc28a788bbabdf3235102cf661600829a9120d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-08-131-1/+1
| | | | | Change-Id: Ia969e1dc630532cc0990c99ad6df7995d47b0f81 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-08-131-1/+1
| | | | | Change-Id: I6455e02ea6eddf093626e24490172ddc3decb1b5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-08-121-1/+1
| | | | | Change-Id: I7a51be44fd575385f6acdd2e2455ee1779f84394 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-08-091-1/+1
| | | | | Change-Id: Iba1ed1b527429e980d0c8963db2fee51228ecdd4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-08-091-1/+1
| | | | | Change-Id: Id454fb8855861fc7e1803def71c445a7abbdb0e7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-08-061-1/+1
| | | | | Change-Id: I82c3642bad5935f50d408015483c007cd6f78a0f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-08-031-1/+1
| | | | | Change-Id: I2401d6978910b830d967a670b671b529a7e03561 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-08-021-1/+1
| | | | | Change-Id: I8ad9cbec4365487b340682210eb947b9b4876272 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump versionJani Heikkinen2021-08-022-2/+2
| | | | Change-Id: I28988e5bb9c57381bb500d02acd36ebd9b4cae03
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-301-1/+1
| | | | | Change-Id: Ib6f328d33b9843ef2431ff0756989083bea7f1d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-301-1/+1
| | | | | Change-Id: Idffface78b20356c9fb1a0d6ebecc7e475c675fc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-231-1/+1
| | | | | Change-Id: I8a4c45eea3fdc61f5a09d83f8781edd94a2de1a9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-231-1/+1
| | | | | Change-Id: I4be51ee77131a725c7d55149eada3f9ec8fa1c2f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-221-1/+1
| | | | | Change-Id: Id17cbd9b2dcb7c669ad4aca25b6a9d09d56441b7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-221-1/+1
| | | | | Change-Id: I629948facb2073a55144dec081985e3fc17d19b2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-211-1/+1
| | | | | Change-Id: Ib01fd785db11b5240a03ccd7b9143ba0df3875d8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-211-1/+1
| | | | | Change-Id: Iae1fb2388292427a6e10100540548af5c42b85c4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-201-1/+1
| | | | | Change-Id: Ia32fff9b29f6c34abe01d9fa8614e6bceca22c28 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-201-1/+1
| | | | | Change-Id: If5fee433c4130f468d84eb8ec40e703d88179a51 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Merge branch '5.15' into 6.1Oswald Buddenhagen2021-07-165-675/+1370
|\ | | | | | | | | | | | | | | Conflicts: translations/qt_pt_BR.ts translations/qtquickcontrols_zh_CN.ts Change-Id: I0a844f6b4612ff87f10d23f5cc90cfef9e491876
| * Merge remote-tracking branch 'origin/5.12' into 5.15Oswald Buddenhagen2021-07-161-4/+4
| |\ | | | | | | | | | Change-Id: I19e42db2ac313cb27253f5dc06d699271c4e79e9
| | * fix pt_BR meta catalogOswald Buddenhagen2021-07-091-4/+4
| | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-95014 Change-Id: If01521cc23038328006533f08eb0ba4de1a64eee Reviewed-by: Luiz Fernando Ranghetti <elchevive68@gmail.com> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | Update simplified chinese translationTyson Tan2021-06-285-698/+1404
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1dc30179591b758720f37f109c553fd910ae3ee Reviewed-by: Yuhang Zhao <2546789017@qq.com> Reviewed-by: Zhang Hao <zhanghao@uniontech.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
* | | Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-161-1/+1
| | | | | | | | | | | | | | | Change-Id: I5fdbd14671cc0418923f3aac06673ad6d5fb07c1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-151-1/+1
| | | | | | | | | | | | | | | Change-Id: I5232a5cd4d76cba5a54f588d3380eb09d47d744e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-151-1/+1
| | | | | | | | | | | | | | | Change-Id: I41ed65f53d8851dbd9e88ec5eda1eb60bf13ee5b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-151-1/+1
| | | | | | | | | | | | | | | Change-Id: Iba34bb5e54bf9f9d0293e4a3d35e6b6b92210ebf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-141-1/+1
| | | | | | | | | | | | | | | Change-Id: I65a950707a1c636a0be01f1f1401b7ffd6ebbc7a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-121-1/+1
| | | | | | | | | | | | | | | Change-Id: I67600ea5b94f5af2ba6c8838b0d1335940b5fcbf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-081-1/+1
| | | | | | | | | | | | | | | Change-Id: I3ffbdfe45b1f06fb27b79f42e6d208ce6832f6bd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-051-1/+1
| | | | | | | | | | | | | | | Change-Id: I2c73456162df70c5864e1d0c0cd2b0d1ca0a2623 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-07-011-1/+1
| | | | | | | | | | | | | | | Change-Id: I33ca8096964530cace3edae8885035ebdd3f5d9c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Add locations to .ts filesKai Köhne2021-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Let the ts-* targets generate .ts files with (relative) location information, like we did in Qt 5. Fixes: QTBUG-94718 Change-Id: I7b9c91805d04c0523798d07dbf830cb9be226410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
* | | Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-06-221-1/+1
| | | | | | | | | | | | | | | Change-Id: I5cac03aee9f52ed7744770a37079c0308510c1db Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-06-211-1/+1
| | | | | | | | | | | | | | | Change-Id: I6ee0d975b3f84bceb29cfb93423f574c36d94c10 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-06-211-1/+1
| | | | | | | | | | | | | | | Change-Id: Ice6a890588124e9f01db7549316ac2d19015f025 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Update dependencies on '6.1' in qt/qttranslationsQt Submodule Update Bot2021-06-211-1/+1
| | | | | | | | | | | | | | | Change-Id: Ia4372f482a5e3d12257166f8d61ccf992cf284f6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>