summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ / /
* | | 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
* | 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
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-0/+25
| |\
| | * Add changes file for 5.9.0v5.9.0-rc2v5.9.0-rc1v5.9.0Jani Heikkinen2017-05-111-0/+25
| * | Doc: Update screenshots of examples to show Windows 10 styleLeena Miettinen2017-05-243-0/+0
| * | Fix usage of old (internal) APIErik Verbruggen2017-05-231-1/+1
| * | Bump versionOswald Buddenhagen2017-05-101-1/+1
| |/
| * Fix bundling of module for static buildsv5.9.0-beta4Julian Strobl2017-05-051-0/+8
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-2133-101/+612
|\|
| * Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta3Liang Qi2017-04-181-0/+1
| |\
| | * Kill the timer when we no longer need it5.8Andy Shaw2017-03-081-0/+1
| * | Fix build without features.commandlineparserv5.9.0-beta2Tasuku Suzuki2017-04-031-1/+1
| * | Doc: Fix QML property types and method signaturesv5.9.0-beta1Leena Miettinen2017-03-234-9/+16
| * | Doc: Add docs for the InvokedServices QML typeLeena Miettinen2017-03-211-0/+33
| * | Doc: Add docs for the EventConnection QML typeLeena Miettinen2017-03-211-0/+37
| * | Doc: Remove docs for property changed signalsLeena Miettinen2017-03-211-13/+2
| * | Doc: Add docs for the ScxmlStateMachine QML typeLeena Miettinen2017-03-211-0/+231
| * | Doc: Showcase the "StateMachine" QML typeUlf Hermann2017-03-161-1/+1
| * | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-1025-70/+175
| |\|
| | * Switch to using QQmlExtensionInterface IDRobin Burchell2017-02-081-1/+1