summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\
| | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-08-311-0/+24
| |/
* | Merge remote-tracking branch 'origin/5.11' into devv5.12.0-alpha1Qt Forward Merge Bot2018-07-310-0/+0
|\|
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
* | Remove compatibility code for private QML APISimon Hausmann2018-07-181-13/+0
* | Fix header inclusion in tst_scion.cppUlf Hermann2018-07-131-1/+1
* | 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-288-6/+53
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-232-1/+25
|\|
| * Merge "Merge remote-tracking branch 'origin/5.11.1' into 5.11" into refs/stag...Qt Forward Merge Bot2018-06-191-0/+24
| |\
| | * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| | |\
| | | * Add changes file for Qt 5.11.1v5.11.1Antti Kokko2018-06-091-0/+24
| | |/
| * / Doc: Add missing dot (qtscxml)Paul Wicking2018-06-191-1/+1
| |/
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-042-0/+48
|\|
| * Add changes file for Qt 5.9.6Antti Kokko2018-06-041-0/+24
| * Add changes file for Qt 5.9.5Antti Kokko2018-06-041-0/+24
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
* | Fix link error on WindowsFriedemann Kleint2018-05-162-1/+8
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+22
|\|
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
| |\
| | * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.0Antti Kokko2018-04-251-0/+22
| |/
* | Fix tst_scion failuresSimon Hausmann2018-05-031-1/+1
* | Don't use foreachJarek Kobus2018-05-021-1/+1
* | Wrap examples' code at 80 columnJarek Kobus2018-05-0210-27/+54
* | Use final keywordJarek Kobus2018-05-021-10/+10
* | Examples: Use override keywordJarek Kobus2018-05-021-10/+10
* | Fix coding style issuesJarek Kobus2018-05-023-7/+7
* | Fix coding style issuesJarek Kobus2018-05-021-1/+1
* | Fix coding style issuesJarek Kobus2018-05-022-3/+3
* | Use canonical include style and sort #includeJarek Kobus2018-05-0211-18/+18
* | Give examples a meaningful window titleJarek Kobus2018-05-023-9/+0
* | examplesrevamp: Don't include QtWidgetsJarek Kobus2018-05-021-1/+2
* | 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
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-117-112/+122
|\|
| * 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
* | | | Bump versionOswald Buddenhagen2018-02-191-1/+1
|/ / /
* | | Merge remote-tracking branch 'origin/5.10' into devv5.11.0-alpha1Liang Qi2018-02-017-2/+79
|\ \ \ | | |/ | |/|