summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' into qt-4.8-from-4.7Liang Qi2011-06-065-36/+16
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-045-36/+16
| |\
| | * Revert some of "Make QMLViewer startup animation stop after a while"Alan Alpert2011-06-033-36/+0
| | * Add private method for flushing the pixmap cache.Michael Brasser2011-06-022-0/+16
* | | Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-06-012-28/+29
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-012-28/+29
| |\ \ | | |/
| | * QDeclarative: Fix QPerformanceTimer on SymbianKai Koehne2011-06-012-28/+29
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-3114-108/+38
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-2714-108/+38
| |\ \ | | |/
| | * Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA...Joona Petrell2011-05-2714-108/+38
* | | Merge branch '4.8' into qt-4.8-from-4.7Liang Qi2011-05-272-1/+4
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-242-1/+4
| |\ \ \
| | * \ \ Merge remote branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2011-05-232-1/+4
| | |\ \ \
| | | * | | DocAaron Kennedy2011-05-161-0/+3
| | | * | | QmlDirParser: Fix typeInfo accessor.Kai Koehne2011-05-121-1/+1
* | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-251-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-251-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Flickable could flick in wrong direction if given too few touch samplesMartin Jones2011-05-251-1/+1
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-242-36/+23
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-202-36/+23
| |\ \ \ \ | | |/ / /
| | * | | Notify when the TextInput cursorRectangle property changes within pre-editAndrew den Exter2011-05-202-36/+23
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-17317-5411/+5411
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update licenseheader text in source filesJyri Tahtela2011-05-13317-5411/+5411
* | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-187-4/+49
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-1625-50/+1618
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | 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 remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-162-0/+33
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into master-...Kai Koehne2011-05-122-0/+33
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Allow 'typeinfo <file>' lines in qmldir.Christian Kamm2011-05-122-0/+33
* | | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-13324-5530/+5530
|/ / / /
* | | | Merge remote branch 'qt/4.8' into master-qml-stagingKai Koehne2011-05-1027-103/+285
|\ \ \ \ | | |/ / | |/| |
| * | | 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 '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
| | | | |\ \ \ \ | | | | | |/ / /