Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-09-16 | 2 | -5/+8 |
|\ | |||||
| * | Merge remote branch 'origin/4.8' into 4.8-from-4.7 | Rohan McGovern | 2011-09-14 | 83 | -596/+2818 |
| |\ | |||||
| * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-09-12 | 2 | -5/+8 |
| |\ \ | |||||
| | * | | StrictlyEnforceRange with snapOneItem/Row and header behavior change | Martin Jones | 2011-09-12 | 2 | -5/+8 |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-09-15 | 3 | -4/+12 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Fix crash in compiled bindings | Aaron Kennedy | 2011-09-14 | 3 | -4/+12 |
* | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-09-07 | 4 | -2/+18 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-09-07 | 4 | -2/+18 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Dragging in nested views no longer works as expected | Martin Jones | 2011-09-07 | 1 | -1/+1 |
| | * | | Fix implicit height not growing when pre-edit text wraps. | Andrew den Exter | 2011-09-06 | 1 | -1/+3 |
| | * | | Fix leak in State element. | Michael Brasser | 2011-09-02 | 1 | -0/+12 |
| | * | | Fix leak in bindings created by PropertyChanges. | Michael Brasser | 2011-09-01 | 1 | -0/+2 |
* | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-09-02 | 2 | -4/+8 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-09-02 | 2 | -4/+8 |
| |\ \ \ | | |/ / | |||||
| | * | | Revert readonly BorderImage::sourceSize change | Martin Jones | 2011-09-01 | 2 | -4/+8 |
| | * | | Fix memory leak in ListModel custom parser | Bea Lam | 2011-09-01 | 1 | -0/+1 |
* | | | | Merge branch 4.8 into qt-4.8-from-4.7 | Sergio Ahumada | 2011-09-01 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote branch 'mainline/4.8' | Casper van Donderen | 2011-08-31 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch '4.8' | Casper van Donderen | 2011-08-30 | 1 | -0/+5 |
| |\ \ \ \ \ | |||||
| | * | | | | | Doc: Internalized QDeclarativeTypeLoader | Geir Vattekar | 2011-08-24 | 1 | -0/+5 |
| | * | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8 | David Boddie | 2011-06-17 | 20 | -97/+193 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8 | David Boddie | 2011-06-09 | 25 | -212/+110 |
| | |\ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7 | Sergio Ahumada | 2011-08-31 | 4 | -4/+7 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-08-30 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | QDeclarative::hasActiveFocus should return false for hidden items | Alan Alpert | 2011-08-30 | 1 | -2/+2 |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-08-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Fix conversion of QAbstractItemModel::rowsMoved() parameters | Bea Lam | 2011-08-29 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-08-27 | 15 | -35/+49 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-08-26 | 2 | -1/+3 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Fix memory leak in ListModel custom parser | Bea Lam | 2011-08-25 | 1 | -0/+1 |
| | * | | | | | | | Correct documentation of TextInput.PasswordEchoOnEdit. | Andrew den Exter | 2011-08-22 | 1 | -1/+2 |
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-08-18 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Improve documentation for QDeclarativeView::setSource() | Keith Isdale | 2011-08-18 | 1 | -0/+2 |
* | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Sergio Ahumada | 2011-08-31 | 15 | -33/+33 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | Revert accidental commit | Bea Lam | 2011-08-30 | 1 | -205/+91 |
| * | | | | | | | | Rework threading internals in XmlListModel to avoid global static | Bea Lam | 2011-08-30 | 1 | -91/+205 |
| * | | | | | | | | Fix undesirable VKB popup at task switch | Miikka Heikkinen | 2011-08-30 | 2 | -2/+2 |
| * | | | | | | | | Doc: Standardized on QtQuick for \since declarations. | David Boddie | 2011-08-30 | 13 | -31/+31 |
* | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-08-27 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Porting the QTBUG-21084 fix to 4.7.4 | mread | 2011-08-26 | 1 | -0/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Sergio Ahumada | 2011-08-26 | 15 | -35/+49 |
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-08-24 | 15 | -33/+33 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-08-23 | 2 | -2/+16 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix left alignment of native RTL pre-edit text. | Andrew den Exter | 2011-08-23 | 2 | -2/+16 |
| | * | | | | | | Revert accidental commit | Bea Lam | 2011-08-11 | 1 | -205/+91 |
| | * | | | | | | Rework threading internals in XmlListModel to avoid global static | Bea Lam | 2011-08-11 | 1 | -91/+205 |
| | |/ / / / / | |||||
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ... | Qt Continuous Integration System | 2011-08-18 | 13 | -31/+31 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Doc: Standardized on QtQuick for \since declarations. | David Boddie | 2011-06-30 | 13 | -31/+31 |
* | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-08-15 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-08-08 | 2 | -2/+2 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | |