summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtxmlpatternsHEADdevQt Submodule Update Bot25 hours1-2/+2
* Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2 days1-2/+2
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot4 days2-153/+115
|\
| * Fix createTokenLookup.sh and re-run itEdward Welbourne7 days2-153/+115
* | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot5 days1-2/+2
* | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot8 days1-2/+2
* | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot11 days1-0/+7
* | Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann11 days5-22/+23
|\ \
| * | Fix Qt6 buildwip/qt6Alexandru Croitor2019-08-061-2/+3
| * | Fix Qt6 buildAlexandru Croitor2019-08-012-13/+13
| * | Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"Simon Hausmann2019-07-179-12/+227
| |\ \
| | * \ Merge remote-tracking branch 'origin/dev' into wip/qt6Simon Hausmann2019-07-179-12/+227
| | |\ \ | |/ / /
| * | | Bump Qt version to Qt 6Alexandru Croitor2019-07-112-7/+7
* | | | Add missing override and remove redundant virtualAlexander Volkov12 days67-473/+473
* | | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-09-2416-879/+957
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-2416-879/+957
| |\ \ \ \ |/ / / / / | | | | _
| * | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-213-5/+48
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-213-5/+48
| | |\ \ \ | |/ / / /
| | * | | Make a test conditional on its set-up having succeededv5.14.0-beta1v5.14.0-alpha1Edward Welbourne2019-09-201-5/+8
| | * | | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-09-192-0/+40
| | |\ \ \
| | | * \ \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-172-0/+40
| | | |\ \ \ | | |/ / / /
| | | * | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"5.13Qt Forward Merge Bot2019-09-081-0/+20
| | | |\ \ \
| | | | * \ \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| | | | |\ \ \ | | | |/ / / /
| | | | * | | Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"5.12Qt Forward Merge Bot2019-09-071-0/+20
| | | | |\ \ \
| | | | | * \ \ Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
| | | | | |\ \ \ | | | | |/ / / /
| | | | | * | | Add changes file for Qt 5.12.5v5.12.55.12.5Antti Kokko2019-08-281-0/+20
| | | | |/ / /
| | | * | | | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
| | | |\ \ \ \
| | | | * \ \ \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| | | | |\ \ \ \ | | | |/ / / / /
| | | | * | | | Add changes file for Qt 5.13.1v5.13.15.13.1Antti Kokko2019-08-061-0/+20
| | | |/ / / /
| * | | | | | Run createParser.sh to update the query transform parserEdward Welbourne2019-09-1713-874/+909
* | | | | | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-09-172-4/+4
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-172-4/+4
| |\ \ \ \ \ \ \ |/ / / / / / / / | | _ / / / / / | | / / / / /
| * | | | | | Fix three warnings from bisonEdward Welbourne2019-09-161-3/+3
| * | | | | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-051-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-051-1/+1
| | |\ \ \ \ \ \ | |/ / / / / / / | | | _ / / / / | | | / / / /
| | * | | | | Change a fall-through comment to Q_FALLTHROUGH()Edward Welbourne2019-09-041-1/+1
| | | |_|_|/ | | |/| | |
* | | | | | data: Add missing override and remove redundant virtualAlexander Volkov2019-09-0232-320/+316
* | | | | | expr: Add missing override and remove redundant virtualAlexander Volkov2019-09-0274-474/+474
* | | | | | functions: Add missing override and remove redundant virtualAlexander Volkov2019-09-0246-207/+207
|/ / / / /
* | | | | Bump versionKari Oikarinen2019-08-271-1/+1
|/ / / /
* | | | Add missing qqmlfile.h includeMitch Curtis2019-07-161-0/+1
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-168-12/+226
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-168-12/+226
| |\ \ \ \ |/ / / / / | | _ / / | | / /
| * | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-117-12/+225
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-117-12/+225
| | |\ \ \ | | | |/ /
| | | * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | * | Fix GCC 9 -Wdeprecated-copyMarc Mutz2019-07-011-0/+2
| | | * | Actually test XmlListModelMarc Mutz2019-07-016-12/+223
| * | | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| |/ / /
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-110-0/+0
|\ \ \ \ | |_|_|/ |/| | |