summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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>
| * / Doc: Add missing dot (qtscxml)Paul Wicking2018-06-191-1/+1
| |/ | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: I476e01b2f141abe019694cb7418be07b5646dc02 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-042-0/+48
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I585cfaac66e0d0f1b36afc23051b42287622c6b9
| * Add changes file for Qt 5.9.6Antti Kokko2018-06-041-0/+24
| | | | | | | | | | | | Change-Id: I44a0dbe975c54c7f66ab86f57d2fdcaac35b5553 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 320735f9a43bd07e4c2b8e9019b5706b00475956)
| * Add changes file for Qt 5.9.5Antti Kokko2018-06-041-0/+24
| | | | | | | | | | | | | | Change-Id: Iafe324b15c4573d2e1a4bf50c22999165bbd00bb Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io> (cherry picked from commit d37ce5ab3bcbdd3258d45a229ac4978f27ca0c12) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: I48ed3fa4faec77b169771a542b6a1d3119723dc3
* | Fix link error on WindowsFriedemann Kleint2018-05-162-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | QScxmlDataModel::ForeachLoopBody::~ForeachLoopBody() needs to be exported for it to be used. Export the class, disable copying and add a constructor, fixing the Clang warning: warning: definition of implicit copy assignment operator for 'ForeachLoopBody' is deprecated because it has a user-declared destructor Task-number: PYSIDE-487 Change-Id: I3f896d9e75a8da072a63cdab9924c58b0c36d482 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+22
|\| | | | | | | Change-Id: I7a5acb73e6fc22af128d7e61ae979548af133488
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
| |\ | | | | | | | | | Change-Id: I92c85a91174d3097a602c23e31efb7c788538365
| | * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.0Antti Kokko2018-04-251-0/+22
| |/ | | | | | | | | | | Change-Id: Ic7ea725319b9a71a318273ea06b37bfeb7937d4f Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | Fix tst_scion failuresSimon Hausmann2018-05-031-1/+1
| | | | | | | | | | | | | | | | | | After commit 8780764b274217b256aadd00114a76bdffbdb1ef in qtdeclarative, calling evaluate("function() { ... }") produces a warning and it will throw a syntax error in the future. Change-Id: Iedf1a634abd8284b9ced932a3855924bed574987 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Don't use foreachJarek Kobus2018-05-021-1/+1
| | | | | | | | | | | | Task-number: QTBUG-60649 Change-Id: I28efb8711343196cd89b1edbae455a9e04422e4b Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Wrap examples' code at 80 columnJarek Kobus2018-05-0210-27/+54
| | | | | | | | | | | | | | | | According to https://wiki.qt.io/Writing_Qt_Examples Task-number: QTBUG-60649 Change-Id: I17073bb3caf32ccd17d93542876a73ed939f12bd Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Use final keywordJarek Kobus2018-05-021-10/+10
| | | | | | | | | | Change-Id: I727f6580a9060e1cab1a33cba0e42fdf9b34c739 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Examples: Use override keywordJarek Kobus2018-05-021-10/+10
| | | | | | | | | | Change-Id: I7191e2020e8c9ec4abe94e0ee5b730270fa66d13 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Fix coding style issuesJarek Kobus2018-05-023-7/+7
| | | | | | | | | | Change-Id: Ica7d960babffbf2ef1e6e43c032c236de4a3472e Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Fix coding style issuesJarek Kobus2018-05-021-1/+1
| | | | | | | | | | | | Task-number: QTBUG-60649 Change-Id: I080ddb7b6b7021a2597ddc19bc820f1c92abcc41 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Fix coding style issuesJarek Kobus2018-05-022-3/+3
| | | | | | | | | | Change-Id: Iaac75c72d5ddb61ebf443acdffad9a14c83aeaf3 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 23:00:09 +0000