summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* QDeclarativeTextInput: update API to use setBlinkingCursorEnabled5.7.0Richard 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.05.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.25.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
| | |\ \ | | | |/
| | | * bic: Add/Replace 5.{0.1,2,3,4}.0 bic data for linux-gcc-amd64Sergio Ahumada2015-02-137-35291/+93413
| | | * Merge remote-tracking branch 'origin/5.4.1' into 5.4Frederik Gladhorn2015-02-103-0/+10
| | | |\
| | | | * This test seems to be unstable on some platformsv5.4.15.4.1Lars Knoll2015-02-041-0/+2
| | | | * Fix empty arrays in QML 1Robert Griebl2015-01-082-0/+8
| | | * | Fix Url in layoutitem example.Friedemann Kleint2015-02-091-1/+1
| | | * | Autotest: Use resources for test dataRainer Keller2015-02-053-3/+9
| | | * | QDeclarativeTextEdit: fix use of uninitialised value.David Faure2015-02-041-1/+1
| | | * | Bump versionOswald Buddenhagen2015-01-161-1/+1
| | | |/
| * | | Update copyright headersAntti Kokko2015-02-231317-7501/+7381
| * | | Replace Q_WS_MAC macro in tst_qdeclarativeflickable::flickVelocity()J-P Nurmi2015-02-231-1/+1
| |/ /
* | | Bump versionOswald Buddenhagen2015-02-241-1/+1
|/ /
* | Fix autotest to not rely on broken operator<<(QDebug, QUrl) behaviorKai Koehne2015-02-131-6/+5
* | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2015-01-191-2/+2
|\ \
| * \ Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-021-2/+2
| |\ \ | | |/
| | * Fix change-of-sign warning detected by ICCThiago Macieira2014-12-171-2/+2
| | * Bump versionOswald Buddenhagen2014-12-121-1/+1
* | | Add missing includes.Friedemann Kleint2015-01-071-0/+1
|/ /
* | [TextLayout] Drop unused memberKonstantin Ritt2014-12-141-16/+0
* | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devSimo Fält2014-12-032-1/+5
|\ \
| * \ Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-212-1/+5
| |\ \ | | |/
| | * Extend timeout in tst_qdeclarativetextedit::delegateLoadingv5.4.0-rc1v5.4.05.4.0Frederik Gladhorn2014-10-291-1/+1
| | * Skip failing test dataAlan Alpert2014-10-271-0/+4
* | | Change test data from 6.7 to 6.5Simo Fält2014-12-032-3/+3
|/ /
* | Do not use QMetaType::registerType.Jędrzej Nowacki2014-11-191-19/+13
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-272-10/+22
|\ \ | |/
| * tests: tst_qdeclarativelanguage: fix filesystem case sensitivityShawn Rutledge2014-10-222-10/+22
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-204-0/+8
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-10-144-0/+8
| |\
| | * compile with QT_NO_CURSOR5.3Joerg Bornemann2014-09-173-0/+6