summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-144-38/+48
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-134-38/+48
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-05-131-15/+20
| | |\
| | | * Fix softkey icon positioning in S60 5.3Miikka Heikkinen2011-05-131-15/+20
| | * | Support word selection list with predictive text from splitviewSami Merila2011-05-133-23/+28
| | |/
* | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-135-4/+14
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-131-1/+1
| |\ \
| | * | Make TextEdit word selection more natural.Andrew den Exter2011-05-131-1/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-123-3/+1
| |\ \ \
| | * | | Clear confusion between QMainWindow and QMainWindowLayout.Fabien Freling2011-05-123-3/+1
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-121-0/+12
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix for rounded corners bug in QMenuJani Hautakangas2011-05-121-0/+12
* | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-123-3/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-121-1/+1
| |\ \ \ \ | | |/ / /
| | * | | QWidgetPrivate::setParent_sys might be using null pointerSami Merila2011-05-121-1/+1
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-121-1/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Ensure the TextEdit cursor delegate is repositioned on mouse events.Andrew den Exter2011-05-121-1/+3
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-121-1/+3
| |\ \ \ \ | | |/ / /
| | * | | Don't crash on an invalid replacementStart from an input method.Andrew den Exter2011-05-121-1/+3
| | * | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Martin Jones2011-04-2789-543/+2964
| | |\ \ \
* | | | | | CompileOlivier Goffart2011-05-121-1/+0
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-1110-6/+255
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-108-6/+251
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | |
| | * | | Introduce platform extension to QGraphicsSystemJani Hautakangas2011-05-108-6/+251
| * | | | Prevent crash in OpenGL engine when scaling images / pixmaps.Samuel Rødal2011-05-092-0/+4
| |/ / /
* | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-114-27/+85
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-05-094-27/+85
| |\ \ \ \
| | * | | | Allow different text for undo actions and items in QUndoViewAlexander Potashev2011-05-093-10/+41
| | * | | | Allow using not only prefixes for undo command textAlexander Potashev2011-05-093-17/+44
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-066-7/+32
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-051-0/+5
| |\ \ \ \
| | * | | | Fix initial main window dimensions for "fullscreen with softkeys" caseMiikka Heikkinen2011-05-051-0/+5
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-046-26/+74
| |\ \ \ \ \
| | * | | | | QPainterPath: Ignore calls with NaN/Infinite parametersAdemar de Souza Reis Jr2011-05-031-19/+47
| | * | | | | memory leak fixTero Toivola2011-05-031-0/+4
| | * | | | | Fixes crash in QWidget::effectiveWinId.Bjørn Erik Nilsen2011-05-022-0/+21
| | * | | | | Fix merge conflictJiang Jiang2011-04-292-0/+6
| | |\ \ \ \ \
| | * | | | | | Revert symbol addition in b033bb9Jiang Jiang2011-04-292-7/+2
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-05-062-18/+33
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-0517-102/+262
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget.Robin Burchell2011-05-052-18/+33
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-05-0510-119/+90
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Compile on WindowsEskil Abrahamsen Blomfeldt2011-05-041-1/+1
| * | | | | | | | Support gamma correction of text on GLEskil Abrahamsen Blomfeldt2011-05-032-9/+14
| * | | | | | | | Remove QFontEngineFT::loadGlyphMetricsJiang Jiang2011-05-032-101/+0
| * | | | | | | | Fixed bug in X11 backend when creating translucent windows.Samuel Rødal2011-05-031-2/+7
| * | | | | | | | Add required font metrics functions to QRawFontJiang Jiang2011-05-022-0/+56
| * | | | | | | | Fixed bug in QPdfEngine::addImage causing mono images to be made 32 bitMatthew Cattell2011-05-021-1/+4
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-05-024-6/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Make pixel size a qreal in QRawFontEskil Abrahamsen Blomfeldt2011-05-022-5/+5