summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionv5.12.125.12Jani Heikkinen2021-10-041-1/+1
| | | | Change-Id: Iaa11777d924fac0de2855fcede5dcdb8a83dbcba
* Bump versionv5.12.11Jani Heikkinen2020-11-061-1/+1
| | | | Change-Id: I4b7d4923fc93f36c039e6e9c01d8bd41ea60adde
* Add changes file for Qt 5.12.10Antti Kokko2020-10-191-0/+28
| | | | | | | Change-Id: I15554d4f7878f89c15dbd22175aee902086b938f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 878112bf670bb9f9caa09de290c63b0f9078d3f0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-141-1/+1
| | | | Change-Id: If9dc63e824fba123e95ddaf2550a64babbaba97b
* Merge remote-tracking branch 'origin/5.12.9' into 5.12Qt Forward Merge Bot2020-06-171-0/+20
|\ | | | | | | Change-Id: I1633651b4a1724a09867520fdc06577e2f787cc1
| * Add changes file for Qt 5.12.9v5.12.9Antti Kokko2020-06-041-0/+20
|/ | | | | | | + 8ff05d1dfb797494f14ec3b044fcea0b45c673ee Bump version Change-Id: I49457c3f5e66fe4d2c6256cc14113dd9ffccc491 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionAlexandru Croitor2020-04-221-1/+1
| | | | Change-Id: I67054d70cc08a7d5ca0ab3f596f944035f9f70da
* Merge remote-tracking branch 'origin/5.12.8' into 5.12Qt Forward Merge Bot2020-04-141-0/+20
|\ | | | | | | Change-Id: I2396a9fc3f02c058b4ca576a7ce5027728461073
| * Add changes file for Qt 5.12.8v5.12.8Antti Kokko2020-03-251-0/+20
|/ | | | | | | + 9d15fd6664c0a09d513941f81dd1da7f5ac9f3b7 Bump version Change-Id: I3f852228484598afa0a4026a73990971f7b1c677 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.12.7' into 5.12Qt Forward Merge Bot2020-01-311-0/+20
|\ | | | | | | Change-Id: I3e334dd3477e01ccca7bb41be5b50f9eff3a2dc7
| * Add changes file for Qt 5.12.7v5.12.7Antti Kokko2020-01-191-0/+20
| | | | | | | | | | | | | | + 8e55411b873d4136fd3af94d8453c215a569aff8 Bump version Change-Id: I155ec169437d61e218151d70a379cc35810fe456 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Bump versionAlexandru Croitor2020-01-281-1/+1
|/
* Merge remote-tracking branch 'origin/5.12.6' into 5.12Qt Forward Merge Bot2020-01-071-0/+20
|\ | | | | | | Change-Id: I59faf7d6678cd43aece0a16c300b4d45c4381365
| * Add changes file for Qt 5.12.6v5.12.6Antti Kokko2019-11-061-0/+20
| | | | | | | | | | | | | | + 62b7af7079546b254ab859649303d2735fc1b7e6 Bump version Change-Id: Ie50327580357e200e89e33cd5920d5b80b6ca5b5 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Bump versionFrederik Gladhorn2019-11-071-1/+1
|/
* Bump versionFrederik Gladhorn2019-10-301-1/+1
|
* 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: Iffee408270a4f433041c73ce34c2d0a9b8a6c7d2
| * Merge "Add changes file for Qt 5.12.5"v5.12.5Antti Kokko2019-08-231-0/+20
|/|
| * Add changes file for Qt 5.12.5Antti Kokko2019-08-231-0/+20
| | | | | | | | | | | | | | + db44c53e73479ee8ea98f911078b387735906f38 Bump version Change-Id: Ia6fca6da6bf2dcd0bdd7d18899e3b84a3e3fe07d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Fix shadow buildSamuli Piippo2019-08-191-4/+4
|/ | | | | | | | Don't write to source directory when using shadow build. This stops working with Qt 5.14.0. Change-Id: Ica83b9c810e2a937aab75af131484f5f91570453 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | Change-Id: Ie78264de8c4b2ff1b455cb0290f8bbd9b7c7f724
* Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
|\
| * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
|/| | | | | | | Change-Id: I593f373f8504eec3a8d7119d5bc8329d90570728
| * Merge "Add changes file for Qt 5.12.4"v5.12.4Antti Kokko2019-05-281-0/+20
| |\
| | * Add changes file for Qt 5.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | Change-Id: Ib05d3e9f6edc753676f4602392a7a84e202fb0d3 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * | Merge 5.12 into 5.12.4Frederik Gladhorn2019-05-271-2/+2
| |\ \ | |/ / |/| / | |/ Change-Id: I84be737c8ab49128e8de26a97ffafd653c542108
* | Fix warnings about fall throughFriedemann Kleint2019-05-271-2/+2
| | | | | | | | | | | | | | | | | | Use Q_FALLTHROUGH, fixing: ../../src/scxml/qscxmlcompiler.cpp:1591:9: warning: this statement may fall through [-Wimplicit-fallthrough=] ../../src/scxml/qscxmlcompiler.cpp:1610:9: warning: this statement may fall through [-Wimplicit-fallthrough=] Change-Id: I39fb346f1c5fa3e328ee82aa14675557034439c9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| * Bump versionFrederik Gladhorn2019-05-231-1/+1
|/ | | | Change-Id: I2f753d67eca332db468f5e957a043fb64fdeef26
* Fix module dependencies of scxmlKai Koehne2019-04-291-2/+2
| | | | | | | | | | | | | | | | Commit 67d9d69b97 made qml a conditional dependency of a qtscxml module. Anyhow, because qt_module.prf was included before the qml dependency was added, the generated qt_libs_scxml.pri file didn't track this dependency. This lead to issues when examples were built against a Qt where libQt5Scxml was not yet installed, and therefore libQt5Qml and libQt5Network wasn't found. Fixes: QTBUG-75383 Change-Id: Ieba5972a1509400aa145fc29b11fbba4c1d625fd Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
|\ | | | | | | Change-Id: Ib36c5d5cd62f3e013005cef2155e95500a0c683c
| * Add changes file for Qt 5.12.3v5.12.3Antti Kokko2019-04-021-0/+20
|/ | | | | | | + 554ac4551c154f39de2917877b189b74e4464d3b Bump version Change-Id: I4fb60f61daaa98b6f0c39ec73d582fc79bd8017f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionKari Oikarinen2019-03-211-1/+1
| | | | Change-Id: I5860cb28eca9c415245117833b4ed4a715aa1258
* Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
|\ | | | | | | Change-Id: If529d2d73b8819003632175de9c6d1330dc910a5
| * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-221-0/+20
|/ | | | | | | | + f167b3cdb61a0bd51360d9736f23e99e5ae0c860 Bump version + dca1cd7cfb03ba383012dbfcf7b40924ac887bf8 examples: depends on Quick instead of Qml Change-Id: I060bc2fc8c3903d360ee2d802e8166b79a6dd22f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* examples: depends on Quick instead of QmlLiang Qi2019-02-131-1/+1
| | | | | Change-Id: I5c824bb2e91b3e7d3a2bb70feb1d8419827482c9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-0/+25
|\ | | | | | | Change-Id: Idf76edb33f833d1f859cf161cb6ca972115180c2
| * Add changes file for Qt 5.12.1v5.12.1Antti Kokko2019-01-101-0/+25
| | | | | | | | | | | | | | | | | | | | + a5effbcb0372020f5ce3134a4f38eb865fd6cdd6 Bump version + bde8d341cc095a3877e4ecc80b02c267bb651d4b Don't suppress <log> tags with missing or bad expr + b99d699a8e1fe1a2968edafa6f0154a2581c2143 Add changes file for Qt 5.11.3 + 2dfb1d046d4a1dcb046bfb287d240a8869c78baa Bump version Change-Id: If1e51901c003d7a9d4d5b5a38b86ddcdce95d122 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Bump versionKari Oikarinen2019-01-141-1/+1
|/ | | | Change-Id: I0699a0a7a6f5e70b668ac78a3e591fb24326d0c0
* Bump versionKari Oikarinen2019-01-071-1/+1
| | | | Change-Id: If9eb231157ba0f213a790c211b992f5b8c5c89de
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I93a99b554094420ef7fa8f365f3c935331cca5c1
| * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| |\ | | | | | | | | | Change-Id: Ic46674ea6d34afa5b4ba52d9c071c3c36c82857b
| | * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-161-0/+20
| |/ | | | | | | | | | | | | + a5effbcb0372020f5ce3134a4f38eb865fd6cdd6 Bump version Change-Id: I5cc03b142fa5030a991962af4473e5f7f21ed160 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | Change-Id: I64eacc07b02a83a436aa3b7450c4a708ca95072c
* | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+23
|\ \ | | | | | | | | | Change-Id: I4264f758b166394dfb5000d66cbf0f813ab27f2c
| * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0Antti Kokko2018-11-081-0/+23
| | | | | | | | | | | | | | | | | | Change-Id: Ia2eff6e331fed65b26625f948989e898773b5e0a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Don't suppress <log> tags with missing or bad exprUlf Hermann2018-11-144-10/+33
|/ / | | | | | | | | | | | | | | | | Rather, output an empty string as message in this case. Ignoring log instructions is highly confusing. Change-Id: Iebb30ffd3ade33f1277f3073f015127a99170e40 Task-number: QTBUG-71746 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta4v5.12.0-beta3v5.12.0-beta2v5.12.0-beta1Qt Forward Merge Bot2018-09-111-0/+24
|\| | | | | | | Change-Id: I6ebcc62d0b89e2364f2d1550e8b02d3a8033247c
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: If2f2bba1d285646e58e18a6b70abd01ec6884f85
| | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-08-311-0/+24
| |/ | | | | | | | | Change-Id: Id4ceb568abb0b2a2b94f2260c2c88513b3224283 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 11:37:57 +0000