summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Increase timeout for send-data/send1 testv5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.0Ulf Hermann2019-05-131-1/+1
| | | | | | | Fixes: QTBUG-75684 Change-Id: I3b379c8f9ee9e17614e663d8842ae4329109c4a4 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add changes file for Qt 5.13.0Antti Kokko2019-05-131-0/+18
| | | | | Change-Id: Icd80ce9e1bdcca3c7a31fc5c1ccd56498e10ae82 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-301-2/+2
|\ | | | | | | Change-Id: I01a6583514a3483ea2706dfd9d70a3c15999969e
| * 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' into 5.13Qt Forward Merge Bot2019-04-201-0/+20
|\| | | | | | | Change-Id: If77dba971c4fd8b19e12e054f2a4e6449186025a
| * 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>
* | Update plugins.qmltypesv5.13.0-beta3Kai Koehne2019-04-121-12/+13
| | | | | | | | | | Change-Id: I0ad674b4855ebf0152a2c13a354fc06a14c11b46 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Automatically register the latest import versionKai Koehne2019-04-125-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | This follows what was done in d28c9f6a for Qt Quick Controls 2. The latest import version (e.g. 1.14 in Qt 5.14) will automatically be registered whenever the Qt version is bumped. This avoids needing to wait until a new type is added (or a new revision is added to an existing type) before being able to use the newest Qt Quick version. Change-Id: Ibe271d4814032fe758545abd31573220ed84b5f8 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2Qt Forward Merge Bot2019-03-270-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I09029f460af99bd0d95ddc33006ea75d4006ef19
| * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | Change-Id: I5860cb28eca9c415245117833b4ed4a715aa1258
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+20
|\| | | | | | | Change-Id: I10d269b8f9078aefbec2d480ba2754f8c3d284ae
| * 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>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-02-161-1/+1
|\| | | | | | | Change-Id: I6ce0f760da8c52e05c4e4eb07b90faef1ccdc500
| * 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' into 5.13Qt Forward Merge Bot2019-02-021-0/+25
|\| | | | | | | Change-Id: I0089485b4db9e61238fb0cc1bfd2fbe918d63ec2
| * 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>
* | | Merge remote-tracking branch 'origin/5.12' into devv5.13.0-alpha1Qt Forward Merge Bot2019-01-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I071a98189a8f8a1b5f2bea28bc6cd407c82d5c18
| * | Bump versionKari Oikarinen2019-01-141-1/+1
| |/ | | | | | | Change-Id: I0699a0a7a6f5e70b668ac78a3e591fb24326d0c0
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ibe762066bb0bd9558fc437e327c5eee2b6008286
| * Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: If9eb231157ba0f213a790c211b992f5b8c5c89de
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-151-0/+20
|\| | | | | | | Change-Id: I3c69bd93a4bf2d3a021bed79d159a250c1650acc
| * 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' into devQt Forward Merge Bot2018-12-081-0/+23
|\| | | | | | | | | | | Change-Id: I6f97d7e8350d55ff16e4cf6a085db157f1742ac6
| * | 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>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-174-10/+33
|\| | | | | | | | | | | | | | | Change-Id: I71ccd0736497f0766c79e77aefb3e671edd3707f
| * | | 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>
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: Ibcaab72fee7b7882cc6ed968c2085939a7094a3f
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-181-0/+24
|\| | | | | | | | | | | Change-Id: If1c32dea8539815c2576d399d2ff2497232c0c56
| * | 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>
* | Merge remote-tracking branch 'origin/5.11' into devv5.12.0-alpha1Qt Forward Merge Bot2018-07-310-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8b27552340e9b30b903e59e3300208b16b688119
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: Ifc0bce9784b49e4bb2b8a879e85c19116f83455c
* | Remove compatibility code for private QML APISimon Hausmann2018-07-181-13/+0
| | | | | | | | | | | | | | | | The old code is not needed anymore now that qt5.git is up-to-date. Change-Id: I4d7a76e338205d0e3b685bc3bba56aa609bbdeeb Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | Fix header inclusion in tst_scion.cppUlf Hermann2018-07-131-1/+1
| | | | | | | | | | | | | | | | What we are looking for here is QScxmlStateMachine, not the ecmascript datamodel. Change-Id: I5c15e38ffb5a6cf6ec1fa8fcf93d2e3f5a093115 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Adjust to internal API changes in qtdeclarativeLars Knoll2018-07-121-0/+12
| | | | | | | | | | | | Task-number: QTBUG-69367 Change-Id: I2e01feebb0166b8279cf28e4cab39d8caaed1d59 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Remove private API guardsSimon Hausmann2018-06-291-4/+0
| | | | | | | | | | | | | | | | After commit 26dd89e493e0957a4086798970b017afe0e932d5 in qt5.git we can remove the guards as the old API is not available anymore. Change-Id: I437f14eec4df74775efb66dc004344e4af068e1a Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Adapt to internal QtQml API changesSimon Hausmann2018-06-281-0/+4
| | | | | | | | | | | | | | | | | | After commit 3e1bb90da4c44455c8c307e01876cc2127bdb15c, query is now called getOwnProperty. Task-number: QTBUG-69180 Change-Id: Ie24b17c1d710cead9cbe4feece7a28d7fa926a0e Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Make the ECMAScript model a configurable featureSimon Hausmann2018-06-288-6/+53
| | | | | | | | | | | | | | | | Introducing this feature allows our users to slim down the module. Task-number: QTBUG-61960 Change-Id: I94215fd3c6dee9766a5f7479bec0440cdfe85ac1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-232-1/+25
|\| | | | | | | Change-Id: I10832de7d3c67ed67ec4b183023ed4ca65729e36
| * Merge "Merge remote-tracking branch 'origin/5.11.1' into 5.11" into ↵Qt Forward Merge Bot2018-06-191-0/+24
| |\ | | | | | | | | | refs/staging/5.11
| | * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I23b98c09f186a1c4da4193728e1a19dd21a4c9f7
| | | * Add changes file for Qt 5.11.1v5.11.1Antti Kokko2018-06-091-0/+24
| | |/ | | | | | | | | | | | | Change-Id: Ie15f1af414b75bb6b8e4ee97d7540a733a7fd38a Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 16:13:19 +0000