summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7HEAD5.7Liang Qi2016-11-251-16/+0
|\
| * remove dependencies from sync.profileOswald Buddenhagen2016-11-051-16/+0
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-177-8/+8
|\ \ | |/
| * Doc: Change instances of 'OS X' to 'macOS'5.6.2Topi Reinio2016-08-157-8/+8
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-011-21/+21
|\ \ | |/
| * Work around ICC bug about C++11 noexcept inheritanceThiago Macieira2016-07-231-21/+21
* | Bump versionOswald Buddenhagen2016-07-011-1/+1
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-2935-60/+761
|\ \ | |/
| * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-294-4/+4
| * Fix gcc warning: if clause does not guardNikita Baryshnikov2016-06-291-1/+2
| * Bump versionOswald Buddenhagen2016-05-191-1/+1
| * do not enable example installs explicitly any moreOswald Buddenhagen2016-04-281-1/+0
| * pretend that the example installs are not FUBAROswald Buddenhagen2016-04-281-0/+2
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-04-123-13/+12
| * qtquick1 doc: Fixed format error in PNG image's gAMA chunk.Edward Welbourne2016-04-111-0/+0
| * Merge remote-tracking branch 'origin/5.6.0' into 5.6Frederik Gladhorn2016-03-1716-18/+710
| |\
| | * Merge remote-tracking branch 'origin/5.5' into 5.6.0Liang Qi2016-02-0412-14/+706
| | |\
| | | * Skip failing autotest tst_qdeclarativetextedit::delegateLoadingv5.5.15.5Kai Koehne2015-09-171-0/+3
| | | * Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-08-190-0/+0
| | | |\
| | | | * Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
| | | * | Add the GPLv3 license textThiago Macieira2015-08-132-0/+688
| | | * | Doc: Replace Mac OS X with OS XNico Vertriest2015-07-167-7/+7
| | | * | QtDeclarative: fix const correctness in old-style castsThiago Macieira2015-07-102-7/+8
| | | * | Bump versionOswald Buddenhagen2015-06-291-1/+1
| | * | | Fix autotests for change in QtNetworkLiang Qi2016-02-044-4/+4
| * | | | Export QDeclarativeTextEditPrivate, QDeclarativeLayoutItemMarc Mutz2016-03-072-2/+2
| * | | | Make more ctors explicitMarc Mutz2016-03-078-13/+13
| * | | | Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-079-22/+30
| * | | | Bump versionOswald Buddenhagen2016-02-081-1/+1
| |/ / /
* | | | QDeclarativeTextInput: update API to use setBlinkingCursorEnabledRichard Moe Gustavsen2016-04-261-1/+1
* | | | Bump versionOswald Buddenhagen2015-09-101-1/+1
* | | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-09-044-0/+10
|\ \ \ \ | |/ / /
| * | | Exclude unstable testSimon Hausmann2015-08-252-0/+4
| * | | Fix build on OS XSimon Hausmann2015-08-252-0/+6
|/ / /
* | | Fix users of QTextLayout::additionalFormats to use the new APIMarc Mutz2015-06-071-2/+2
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-039-208/+4
|\ \ \ | |/ /
| * | Reanimate tests/auto/declarative/qdeclarativewebviewv5.5.0-rc1v5.5.0Friedemann Kleint2015-05-292-0/+2
| * | Turn the QDeclarativeView Qt Designer plugin into a uiplugin.Friedemann Kleint2015-05-192-2/+2
| * | Remove duplicated Qt Designer plugin from tools.Friedemann Kleint2015-05-185-206/+0
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-05-1618-48/+47
|\ \ \ | |/ /
| * | tst_qdeclarativeimage: update big256.pngv5.5.0-beta1Shawn Rutledge2015-04-221-0/+0
| * | Fix Blackberry and QNX 6.6 buildSergio Martins2015-03-293-3/+3
| * | Remove the old headersclean unit testThiago Macieira2015-03-252-3/+0
| * | QtDeclarative: fix const correctnessThiago Macieira2015-03-1711-41/+44
| * | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-03-171-1/+0
| |\ \ | | |/
| | * Doc: Removing url variable from qdocconf file.v5.4.2Sergio Ahumada2015-03-061-1/+0
* | | Use QByteArray::toDouble() instead of qstrtod.Erik Verbruggen2015-03-041-5/+1
* | | Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-03-041327-42798/+100816
|\ \ \ | |/ /
| * | Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5v5.5.0-alpha1Frederik Gladhorn2015-02-2415-35296/+93434
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-2015-35296/+93434
| | |\ \ | | | |/