Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-07-01 | 2 | -7/+10 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-06-29 | 2 | -7/+10 |
| |\ | |||||
| | * | Fix text color in some cases of QML and QStaticText | Eskil Abrahamsen Blomfeldt | 2011-06-29 | 2 | -7/+10 |
* | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-06-22 | 2 | -4/+5 |
|\ \ \ | |||||
| * \ \ | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7 | Jani Hautakangas | 2011-06-22 | 2 | -4/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-06-21 | 2 | -4/+5 |
| | |\ \ | |||||
| | | * | | Fix crash in PropertyChanges. | Michael Brasser | 2011-06-21 | 1 | -2/+3 |
| | | * | | Scroll correctly when cursorPosition is changed within onTextChanged. | Andrew den Exter | 2011-06-20 | 1 | -2/+2 |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-06-22 | 2 | -2/+14 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix QDeclarativeInspector when starting with ,block | Aurindam Jana | 2011-06-21 | 2 | -2/+14 |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-06-21 | 3 | -6/+30 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | QDeclarativeDebug: Fix cases where multiple packets arrive in one go | Kai Koehne | 2011-06-20 | 1 | -6/+13 |
| * | | | | Rewrite autotests for js debugging | Aurindam Jana | 2011-06-14 | 1 | -0/+11 |
| * | | | | Create property cache in case of Component{} root | Aaron Kennedy | 2011-06-10 | 1 | -0/+6 |
* | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-06-17 | 42 | -309/+303 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-06-09 | 20 | -97/+193 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | QDeclarativeDebug: Don't hang if started with ',block' argument | Kai Koehne | 2011-06-09 | 1 | -0/+1 |
| | * | | | | QDeclarativeDebug: Fix QJSDebugService if launched with ',block' | Kai Koehne | 2011-06-08 | 3 | -1/+24 |
| | * | | | | Fix docs on caching for images loaded by image providers | Bea Lam | 2011-06-02 | 3 | -4/+39 |
| | * | | | | QDeclarative: fixed clean animation lists | Christiaan Janssen | 2011-05-31 | 3 | -7/+39 |
| | * | | | | Renamed declarativeobserver plugin to qmldbg_inspector | Thorbjørn Lindeijer | 2011-05-30 | 5 | -39/+39 |
| | * | | | | QmlDebugger: adding slots to items in Live Preview | Christiaan Janssen | 2011-05-30 | 2 | -3/+5 |
| | * | | | | QmlDebugger: parsing packets iteratively in the communication protocol | Christiaan Janssen | 2011-05-30 | 1 | -38/+35 |
| | * | | | | ListView segmentation fault when setting highlight to null | Martin Jones | 2011-05-30 | 3 | -3/+9 |
| | * | | | | Merge remote-tracking branch 'qt/4.8' into master-qml-team | Kai Koehne | 2011-05-24 | 324 | -5645/+5981 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-06-08 | 22 | -208/+106 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | 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 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 branch 'qt/4.8' into fire-master | Paul Olav Tvete | 2011-06-06 | 325 | -5465/+7081 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | 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 |