Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-06-06 | 5 | -36/+16 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-06-04 | 5 | -36/+16 |
| |\ | |||||
| | * | Revert some of "Make QMLViewer startup animation stop after a while" | Alan Alpert | 2011-06-03 | 3 | -36/+0 |
| | * | Add private method for flushing the pixmap cache. | Michael Brasser | 2011-06-02 | 2 | -0/+16 |
* | | | Merge remote branch 'origin/4.7' into 4.8-from-4.7 | Rohan McGovern | 2011-06-01 | 2 | -28/+29 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-06-01 | 2 | -28/+29 |
| |\ \ | | |/ | |||||
| | * | QDeclarative: Fix QPerformanceTimer on Symbian | Kai Koehne | 2011-06-01 | 2 | -28/+29 |
* | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-31 | 14 | -108/+38 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-27 | 14 | -108/+38 |
| |\ \ | | |/ | |||||
| | * | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA... | Joona Petrell | 2011-05-27 | 14 | -108/+38 |
* | | | Merge branch '4.8' into qt-4.8-from-4.7 | Liang Qi | 2011-05-27 | 2 | -1/+4 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-05-24 | 2 | -1/+4 |
| |\ \ \ | |||||
| | * \ \ | Merge remote branch 'qt-qml-review/master' into master-qml-staging | Kai Koehne | 2011-05-23 | 2 | -1/+4 |
| | |\ \ \ | |||||
| | | * | | | Doc | Aaron Kennedy | 2011-05-16 | 1 | -0/+3 |
| | | * | | | QmlDirParser: Fix typeInfo accessor. | Kai Koehne | 2011-05-12 | 1 | -1/+1 |
* | | | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-05-25 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-25 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Flickable could flick in wrong direction if given too few touch samples | Martin Jones | 2011-05-25 | 1 | -1/+1 |
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-24 | 2 | -36/+23 |
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-20 | 2 | -36/+23 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Notify when the TextInput cursorRectangle property changes within pre-edit | Andrew den Exter | 2011-05-20 | 2 | -36/+23 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-17 | 317 | -5411/+5411 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Update licenseheader text in source files | Jyri Tahtela | 2011-05-13 | 317 | -5411/+5411 |
* | | | | | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-18 | 7 | -4/+49 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-16 | 25 | -50/+1618 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-05-13 | 3 | -4/+36 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | QDeclarativeMouseArea: block context menu events | Caio Marcelo de Oliveira Filho | 2011-05-13 | 2 | -0/+29 |
| | * | | | | ListViews loses items if all visible items are removed. | Martin Jones | 2011-05-13 | 1 | -4/+7 |
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-06 | 5 | -0/+13 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Views do not notify count changes properly | Martin Jones | 2011-05-05 | 3 | -0/+9 |
| | * | | | | Uninitialized memory is compared. | Martin Jones | 2011-05-05 | 2 | -0/+4 |
| | | |/ / | | |/| | | |||||
* | | | | | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-16 | 2 | -0/+33 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into master-... | Kai Koehne | 2011-05-12 | 2 | -0/+33 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Allow 'typeinfo <file>' lines in qmldir. | Christian Kamm | 2011-05-12 | 2 | -0/+33 |
* | | | | | Update licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-05-13 | 324 | -5530/+5530 |
|/ / / / | |||||
* | | | | Merge remote branch 'qt/4.8' into master-qml-staging | Kai Koehne | 2011-05-10 | 27 | -103/+285 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-05-05 | 1 | -0/+2 |
| |\ \ \ | |||||
| | * | | | Fix compilation with QT_NO_* | Tasuku Suzuki | 2011-05-02 | 1 | -0/+2 |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-05-04 | 5 | -2/+133 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-04-29 | 1 | -0/+5 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-04-28 | 1 | -0/+5 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Clear the root index when the model is reset. | Girish Ramakrishnan | 2011-04-27 | 1 | -0/+5 |
| | | * | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7 | Martin Jones | 2011-04-27 | 26 | -193/+219 |
| | | |\ \ \ | |||||
| * | | \ \ \ | Merge branch '4.8-upstream' | Thierry Bastian | 2011-04-28 | 21 | -96/+263 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-04-27 | 5 | -8/+32 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-04-27 | 5 | -8/+32 |
| | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-27 | 3 | -4/+13 |
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | | | / / / | | | | | |/ / / | | | | |/| | | | |||||
| | | | | * | | | Ignore changes to selectByMouse during a selection. | Andrew den Exter | 2011-04-27 | 2 | -4/+11 |
| | | | | * | | | PathView offset out of sync with currentIndex when items are removed. | Martin Jones | 2011-04-27 | 1 | -0/+2 |
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-27 | 1 | -1/+5 |
| | | | |\ \ \ \ | | | | | |/ / / |