Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-05-14 | 4 | -38/+48 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-13 | 4 | -38/+48 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7 | Sami Merila | 2011-05-13 | 1 | -15/+20 |
| | |\ | |||||
| | | * | Fix softkey icon positioning in S60 5.3 | Miikka Heikkinen | 2011-05-13 | 1 | -15/+20 |
| | * | | Support word selection list with predictive text from splitview | Sami Merila | 2011-05-13 | 3 | -23/+28 |
| | |/ | |||||
* | | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-05-13 | 5 | -4/+14 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-13 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Make TextEdit word selection more natural. | Andrew den Exter | 2011-05-13 | 1 | -1/+1 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-05-12 | 3 | -3/+1 |
| |\ \ \ | |||||
| | * | | | Clear confusion between QMainWindow and QMainWindowLayout. | Fabien Freling | 2011-05-12 | 3 | -3/+1 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-12 | 1 | -0/+12 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Fix for rounded corners bug in QMenu | Jani Hautakangas | 2011-05-12 | 1 | -0/+12 |
* | | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-05-12 | 3 | -3/+7 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-12 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | QWidgetPrivate::setParent_sys might be using null pointer | Sami Merila | 2011-05-12 | 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-12 | 1 | -1/+3 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Ensure the TextEdit cursor delegate is repositioned on mouse events. | Andrew den Exter | 2011-05-12 | 1 | -1/+3 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-12 | 1 | -1/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Don't crash on an invalid replacementStart from an input method. | Andrew den Exter | 2011-05-12 | 1 | -1/+3 |
| | * | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7 | Martin Jones | 2011-04-27 | 89 | -543/+2964 |
| | |\ \ \ | |||||
* | | | | | | Compile | Olivier Goffart | 2011-05-12 | 1 | -1/+0 |
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-11 | 10 | -6/+255 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-10 | 8 | -6/+251 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | | | |||||
| | * | | | Introduce platform extension to QGraphicsSystem | Jani Hautakangas | 2011-05-10 | 8 | -6/+251 |
| * | | | | Prevent crash in OpenGL engine when scaling images / pixmaps. | Samuel Rødal | 2011-05-09 | 2 | -0/+4 |
| |/ / / | |||||
* | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-11 | 4 | -27/+85 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-05-09 | 4 | -27/+85 |
| |\ \ \ \ | |||||
| | * | | | | Allow different text for undo actions and items in QUndoView | Alexander Potashev | 2011-05-09 | 3 | -10/+41 |
| | * | | | | Allow using not only prefixes for undo command text | Alexander Potashev | 2011-05-09 | 3 | -17/+44 |
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-06 | 6 | -7/+32 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-05 | 1 | -0/+5 |
| |\ \ \ \ | |||||
| | * | | | | Fix initial main window dimensions for "fullscreen with softkeys" case | Miikka Heikkinen | 2011-05-05 | 1 | -0/+5 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-05-04 | 6 | -26/+74 |
| |\ \ \ \ \ | |||||
| | * | | | | | QPainterPath: Ignore calls with NaN/Infinite parameters | Ademar de Souza Reis Jr | 2011-05-03 | 1 | -19/+47 |
| | * | | | | | memory leak fix | Tero Toivola | 2011-05-03 | 1 | -0/+4 |
| | * | | | | | Fixes crash in QWidget::effectiveWinId. | Bjørn Erik Nilsen | 2011-05-02 | 2 | -0/+21 |
| | * | | | | | Fix merge conflict | Jiang Jiang | 2011-04-29 | 2 | -0/+6 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Revert symbol addition in b033bb9 | Jiang Jiang | 2011-04-29 | 2 | -7/+2 |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-05-06 | 2 | -18/+33 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/4.8' | Olivier Goffart | 2011-05-05 | 17 | -102/+262 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | |||||
| * | | | | | | | | Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget. | Robin Burchell | 2011-05-05 | 2 | -18/+33 |
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-05-05 | 10 | -119/+90 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Compile on Windows | Eskil Abrahamsen Blomfeldt | 2011-05-04 | 1 | -1/+1 |
| * | | | | | | | | Support gamma correction of text on GL | Eskil Abrahamsen Blomfeldt | 2011-05-03 | 2 | -9/+14 |
| * | | | | | | | | Remove QFontEngineFT::loadGlyphMetrics | Jiang Jiang | 2011-05-03 | 2 | -101/+0 |
| * | | | | | | | | Fixed bug in X11 backend when creating translucent windows. | Samuel Rødal | 2011-05-03 | 1 | -2/+7 |
| * | | | | | | | | Add required font metrics functions to QRawFont | Jiang Jiang | 2011-05-02 | 2 | -0/+56 |
| * | | | | | | | | Fixed bug in QPdfEngine::addImage causing mono images to be made 32 bit | Matthew Cattell | 2011-05-02 | 1 | -1/+4 |
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team | aavit | 2011-05-02 | 4 | -6/+9 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Make pixel size a qreal in QRawFont | Eskil Abrahamsen Blomfeldt | 2011-05-02 | 2 | -5/+5 |