summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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>
* | Use canonical include style and sort #includeJarek Kobus2018-05-0211-18/+18
| | | | | | | | | | | | | | | | See also https://wiki.qt.io/Writing_Qt_Examples Task-number: QTBUG-60649 Change-Id: I3a5671f39e870f96546e66427cc9434f41777e33 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Give examples a meaningful window titleJarek Kobus2018-05-023-9/+0
| | | | | | | | | | | | | | | | They will get the app name, like other examples Task-number: QTBUG-60649 Change-Id: Ib66a37e0c1253f12d9fa0ec19a2f1220e7277f05 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | examplesrevamp: Don't include QtWidgetsJarek Kobus2018-05-021-1/+2
| | | | | | | | | | | | | | | | Include only what's needed. Task-number: QTBUG-60649 Change-Id: I9c1423c56afe85f65a36f7f7982b96e87fade012 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Use nullptr instead of 0Jarek Kobus2018-05-024-5/+5
| | | | | | | | | | Change-Id: I94da16599d11c4877cff4e38c9d91799737a653a Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-8/+1
| | | | | | | | | | | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: Id7ef0308bdc029377e3e6c605feff91c1defb231 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-117-112/+122
|\| | | | | | | Change-Id: If0126110e8523590b2b84a9cea26a33757c37e32
| * Fix Qt5ScxmlMacros.cmake for CMake 3.9v5.11.0-beta4v5.11.0-beta3Rolf Eike Beer2018-03-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | CMake gained support for running AUTOMOC on generated headers, so we need to mark them with SKIP_AUTOMOC since we're generating moc files for those already. Otherwise we get duplicated symbols. The same change has already been done for generated DBus files, but it is needed here, too. Change-Id: I48a998bc1769478d34d8f30f0e849cd91bc1f785 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: David Faure <david.faure@kdab.com>
| * Doc: Exclude a private header to suppress QDoc warningsLeena Miettinen2018-03-231-0/+2
| | | | | | | | | | Change-Id: Ib157544d54e73e9afeca0dc01c3509be3773e1a0 Reviewed-by: Martin Smith <martin.smith@qt.io>
| * Align methods and docs for QScxmlStateMachineUlf Hermann2018-03-222-103/+63
| | | | | | | | | | | | | | | | | | | | | | | | qdoc can nowadays parse the complex method declarations in qscxmlstatemachine.h, so we don't need to ifdef them out anymore. Also, recognize that the context parameters to the connect methods can all be const, as documented, and rename some parameters to match the documentation. Change-Id: Iad200f9d4719d5c34e74ad0cc002338322662e8f Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * Remove Q_QDOC ifdefs from qscxmlexecutablecontent_p.hUlf Hermann2018-03-221-2/+0
| | | | | | | | | | | | | | | | qdoc shouldn't try to generate docs for methods in private headers. Why does it try for those? Change-Id: Ib9bb78c9bbdd854ffa48601c6a29dc30718f4155 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| * Doc: Document anonymous enums in QScxmlExecutableContentLeena Miettinen2018-03-221-1/+17
| | | | | | | | | | | | | | | | To fix QDoc warnings. Change-Id: I117471c55caab3030212aea763b5a9c19f492a0c Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 13:25:44 +0000