summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtscriptHEADdevQt Submodule Update Bot17 hours1-2/+2
* Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot29 hours1-2/+2
* Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot44 hours1-2/+2
* Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2 days1-1/+1
* Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot3 days1-2/+2
* Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot3 days1-2/+2
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot7 days1-1/+3
|\
| * Fix crash in QScriptEngine::reportAdditionalMemoryCostLars Knoll11 days1-1/+3
* | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot8 days1-2/+2
* | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot11 days1-2/+2
* | Update dependencies on 'dev' in qt/qtscriptQt Submodule Update Bot2019-10-041-0/+7
* | Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-10-049-18/+21
|\ \
| * | Fix Qt6 buildwip/qt6Alexandru Croitor2019-08-013-8/+8
| * | Bump Qt version to Qt 6Alexandru Croitor2019-07-116-10/+13
* | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-09-242-0/+40
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-242-0/+40
| |\ \ \ |/ / / / | | | _
| * | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-212-0/+40
| |\ \ |/ / /
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-212-0/+40
| |\ \ |/ / /
| * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta1v5.14.0-alpha1Qt Forward Merge Bot2019-09-172-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"Qt 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-231-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-07-301-0/+20
* | | | | | Bump versionKari Oikarinen2019-08-271-1/+1
|/ / / / /
* | | | | Remove usages of deprecated APIsSona Kurazyan2019-08-2312-14/+14
* | | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-08-132-0/+10181
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-132-0/+10181
| |\ \ \ \ \ |/ / / / / / | | _ / / / | | / / /
| * | | | Binary compatibility files for Qt5.13.0 for QtScriptMilla Pohjanheimo2019-08-122-0/+10181
| |/ / /
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-200-0/+0
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-200-0/+0
| |\ \ \ \ |/ / / / / | | _ / / | | / /
| * | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-110-0/+0
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-110-0/+0
| | |\ \ \ | | | |/ /
| | | * | Bump versionFrederik Gladhorn2019-07-011-1/+1
* | | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Edward Welbourne2019-07-112-0/+2
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/5.13' into devEdward Welbourne2019-07-112-0/+2
| |\ \ \ \ \ |/ / / / / / | | _ / / / | | / / /
| * | | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-092-0/+2
| |/ / /
| * | | Bump versionFrederik Gladhorn2019-07-011-1/+1
* | | | Mark the module free of Java-style iterators and QLinkedListMarc Mutz2019-07-111-1/+1
| |_|/ |/| |
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-291-0/+20
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-291-0/+20
| |\ \ \ |/ / / / | | _ / | | /
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-281-0/+20
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-0/+20
| | |\ \ | |/ / / | | | _
| | * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| | | |\ | | |/ /
| | | * Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+20