summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-133-4/+36
|\
| * QDeclarativeMouseArea: block context menu eventsCaio Marcelo de Oliveira Filho2011-05-132-0/+29
| * ListViews loses items if all visible items are removed.Martin Jones2011-05-131-4/+7
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-065-0/+13
|\ \ | |/
| * Views do not notify count changes properlyMartin Jones2011-05-053-0/+9
| * Uninitialized memory is compared.Martin Jones2011-05-052-0/+4
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-051-0/+2
|\ \
| * | Fix compilation with QT_NO_*Tasuku Suzuki2011-05-021-0/+2
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-045-2/+133
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-04-1441-417/+640
| |\ \
| * | | QDeclarativeDebug: Handle case where client with ongoing queries is deletedKai Koehne2011-03-301-0/+46
| * | | Merge ../qt-qml-stagingYann Bodson2011-03-299-41/+75
| |\ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtAlan Alpert2011-03-2312-19/+102
| |\ \ \ \
| * | | | | Optimization and benchmark for setting object properties from QML.Michael Brasser2011-03-161-0/+27
| * | | | | Merge branch 'master' of ../qt-qml-stagingYann Bodson2011-03-1643-608/+2097
| |\ \ \ \ \
| * | | | | | Add Constant and Final flags to QMetaObjectBuilderBea Lam2011-03-142-1/+60
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-stagingMartin Jones2011-03-0134-220/+440
| |\ \ \ \ \ \
| * | | | | | | Fixed QML TextEdit docsThiago Marcos P. Santos2011-02-251-1/+0
* | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-04-291-0/+5
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-281-0/+5
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Clear the root index when the model is reset.Girish Ramakrishnan2011-04-271-0/+5
| | * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Martin Jones2011-04-2726-193/+219
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Merge branch '4.8-upstream'Thierry Bastian2011-04-2821-96/+263
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-04-275-8/+32
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-275-8/+32
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-273-4/+13
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | / / / / / / / | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Ignore changes to selectByMouse during a selection.Andrew den Exter2011-04-272-4/+11
| | | | * | | | | | | PathView offset out of sync with currentIndex when items are removed.Martin Jones2011-04-271-0/+2
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-271-1/+5
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Move the TextInput cursor delegate when the preedit position changes.Andrew den Exter2011-04-271-1/+5
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-262-3/+14
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Support text decoration in QML when using static text back-endEskil Abrahamsen Blomfeldt2011-04-181-0/+10
| | | | * | | | | | | | Fix missing color in text when using static text back-end in QMLEskil Abrahamsen Blomfeldt2011-04-182-3/+4
| * | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix warning about ASCII cast in calling QString::containsThiago Macieira2011-04-261-1/+1
| * | | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-261-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| / / / / / / / / / | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-261-3/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Set QPixmapCache default limit to 10MB on Symbian.Jani Hautakangas2011-04-261-3/+1
| * | | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-226-17/+64
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-216-17/+64
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Document section behavior when not ordered by sectionMartin Jones2011-04-211-0/+8
| | | * | | | | | | | | Fix TextInput echoMode clearing inputMethodHints set by the user.Andrew den Exter2011-04-213-12/+37
| | | * | | | | | | | | Elide has unexpected effect on Text's implicitWidthMartin Jones2011-04-212-5/+19
| * | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-215-4/+46
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-211-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | QDeclarativeDebug: Fix typo in warningKai Koehne2011-04-201-1/+1
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-204-3/+45
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | / / / / / / / | | | |_|/ / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | QDeclarativeDebug: Fix endless loop for property with SCRITABLE falseKai Koehne2011-04-201-3/+9
| | | * | | | | | | | Make QMLViewer startup animation stop after a whileAlan Alpert2011-04-193-0/+36
| * | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-208-64/+120
| |\ \ \ \ \ \ \ \ \ \