summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-031-2/+2
|\
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-021-2/+2
| |\
| | * Fix warnings about fall throughFriedemann Kleint2019-05-271-2/+2
* | | Optimize connectToState() methodJarek Kobus2019-05-292-2/+7
* | | Fix deprecation warning about QVector<T>::fromStdVector()Friedemann Kleint2019-05-271-2/+2
* | | Fix deprecation warnings about QVector<T>::fromStdVector()Friedemann Kleint2019-05-271-4/+6
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-05-021-2/+2
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-301-2/+2
| |\ \ | | |/
| | * Fix module dependencies of scxmlKai Koehne2019-04-291-2/+2
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-135-19/+25
|\ \ \ | |/ /
| * | Update plugins.qmltypesv5.13.0-beta3Kai Koehne2019-04-121-12/+13
| * | Automatically register the latest import versionKai Koehne2019-04-125-7/+12
| |/
* | Remove unneeded includeJarek Kobus2019-02-081-1/+0
|/
* Don't suppress <log> tags with missing or bad exprUlf Hermann2018-11-141-10/+12
* Remove compatibility code for private QML APISimon Hausmann2018-07-181-13/+0
* Adjust to internal API changes in qtdeclarativeLars Knoll2018-07-121-0/+12
* Remove private API guardsSimon Hausmann2018-06-291-4/+0
* Adapt to internal QtQml API changesSimon Hausmann2018-06-281-0/+4
* Make the ECMAScript model a configurable featureSimon Hausmann2018-06-287-6/+48
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-231-1/+1
|\
| * Doc: Add missing dot (qtscxml)Paul Wicking2018-06-191-1/+1
* | Fix link error on WindowsFriedemann Kleint2018-05-162-1/+8
* | Fix tst_scion failuresSimon Hausmann2018-05-031-1/+1
* | Fix coding style issuesJarek Kobus2018-05-021-2/+2
* | Fix coding style issuesJarek Kobus2018-05-022-3/+3
* | Use nullptr instead of 0Jarek Kobus2018-05-024-5/+5
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-8/+1
|/
* Fix Qt5ScxmlMacros.cmake for CMake 3.9v5.11.0-beta4v5.11.0-beta3Rolf Eike Beer2018-03-231-0/+1
* Doc: Exclude a private header to suppress QDoc warningsLeena Miettinen2018-03-231-0/+2
* Align methods and docs for QScxmlStateMachineUlf Hermann2018-03-222-103/+63
* Remove Q_QDOC ifdefs from qscxmlexecutablecontent_p.hUlf Hermann2018-03-221-2/+0
* Doc: Document anonymous enums in QScxmlExecutableContentLeena Miettinen2018-03-221-1/+17
* Doc: Fix documentation warningsTopi Reinio2018-03-202-16/+23
* Merge remote-tracking branch 'origin/5.10' into devv5.11.0-alpha1Liang Qi2018-02-011-2/+0
|\
| * Remove unnecessary Q_OBJECT_CHECK macroThiago Macieira2017-11-221-2/+0
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-202-3/+19
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-151-3/+8
| |\
| | * Output a better warning when runtime-loading malformed SCXMLUlf Hermann2017-11-101-3/+8
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-301-1/+12
| |\ \ | | |/
| | * Properly convert URLs to local files in QML state machine loaderUlf Hermann2017-08-171-1/+12
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-2713-71/+71
* | | Replace Q_DECL_FINAL with finalKevin Funk2017-09-227-42/+42
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-2111-110/+110
|/ /
* | Cleanup JS includes, remove unneeded codev5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1Jarek Kobus2017-08-184-11/+4
* | Pre-declare some meta types in the headersUlf Hermann2017-08-173-2/+9
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-173-4/+32
|\ \ | |/
| * Fix the crash when sending an event into not running seviceJarek Kobus2017-08-151-1/+1
| * Fix emission of state changed signalsJarek Kobus2017-08-142-1/+29
| * Update examples to C++11Michael Winkelmann2017-07-181-2/+2
* | Remove unused and unimplemented private methodJarek Kobus2017-08-141-1/+0
|/