summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.0Antti Kokko2018-04-251-0/+22
* 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.1' into 5.11v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-211-0/+26
|\
| * Add changes file for Qt 5.10.1v5.10.1Antti Kokko2018-02-061-0/+26
* | Merge remote-tracking branch 'origin/5.9' into 5.11Liang Qi2018-02-180-0/+0
|\ \
| * | Bump versionOswald Buddenhagen2018-02-021-1/+1
* | | Merge remote-tracking branch 'origin/5.10' into devv5.11.0-alpha1Liang Qi2018-02-017-2/+79
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-181-0/+25
| |\|
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
| | |\
| | | * Add changes file for Qt 5.9.4v5.9.4Antti Kokko2018-01-081-0/+25
| | |/
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| | |\
| * | | qtlite: Skip building examples when configured with no-feature-itemviewsRainer Keller2018-01-123-0/+3
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-082-0/+51
| |\ \ \
| | * | | Add changes file for Qt 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Alex Blasche2017-11-221-0/+27
| | * | | Merge remote-tracking branch 'origin/5.9.3' into 5.10.0Liang Qi2017-11-211-0/+24
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Add changes file for Qt 5.9.3v5.9.3Antti Kokko2017-11-101-0/+24
| * | | | Remove unnecessary Q_OBJECT_CHECK macroThiago Macieira2017-11-221-2/+0
| |/ / /
* | | | Make the network dependency explicit in the exampleKarsten Heimrich2018-01-231-1/+1
* | | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-206-16/+62
|\| | |
| * | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-152-3/+11
| |\ \ \ | | | |/ | | |/|
| | * | Output a better warning when runtime-loading malformed SCXMLUlf Hermann2017-11-102-3/+11
| | |/
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-304-14/+52
| |\|
| | * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | * Add changes file for Qt 5.9.2v5.9.2Antti Kokko2017-09-281-0/+22
| | * QML code improvements for examplesMichael Winkelmann2017-09-112-13/+18
| | * Properly convert URLs to local files in QML state machine loaderUlf Hermann2017-08-171-1/+12
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-2716-86/+86
* | | Replace Q_DECL_FINAL with finalKevin Funk2017-09-228-43/+43
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-2114-117/+117
* | | Bump versionFrederik Gladhorn2017-09-041-1/+1
|/ /
* | 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-177-10/+9
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-1718-24/+179
|\|
| * Fix the crash when sending an event into not running seviceJarek Kobus2017-08-154-2/+68
| * Fix emission of state changed signalsJarek Kobus2017-08-145-1/+62
| * Update examples to C++11Michael Winkelmann2017-07-1810-21/+20
| * Fix the layout of lights in simple trafficlight exampleJarek Kobus2017-07-051-0/+2
| * Bump versionOswald Buddenhagen2017-06-301-1/+1
| * Add changes file for 5.9.1v5.9.1Alex Blasche2017-06-231-0/+27
* | Remove unneeded member and dead codeJarek Kobus2017-08-142-6/+2
* | Remove unused and unimplemented private methodJarek Kobus2017-08-141-1/+0
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-077-10/+45
|\|
| * Fix a crash when log tag doesn't contain the expr attributeJarek Kobus2017-06-011-9/+11