summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Fix cursor position test on CursorOnCharacter caseJiang Jiang2011-05-253-4/+9
* Merge remote branch 'mainline/4.7' into 4.7Jiang Jiang2011-05-245-57/+53
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-201-22/+44
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-182-6/+2
| |\ \
| | * | Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-182-6/+2
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-181-1/+1
| |\ \ \
| * | | | Re-apply licenseheader text in source files for qt4.7Jyri Tahtela2011-05-183-51/+51
* | | | | Fix xToCursor issue due to backporting from 4.8Jiang Jiang2011-05-241-0/+2
* | | | | Support placing cursor in ligature with mouse or touchJiang Jiang2011-05-233-7/+74
| |_|_|/ |/| | |
* | | | Fix ligature offset in multi-line textJiang Jiang2011-05-201-2/+2
* | | | Make selection work across ligaturesJiang Jiang2011-05-201-21/+43
| |/ / |/| |
* | | Fix broken drawing with large fonts using QStaticText and FreeTypeEskil Abrahamsen Blomfeldt2011-05-181-1/+1
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-171153-19574/+19574
|\ \
| * | Update licenseheader text in source filesJyri Tahtela2011-05-131153-19574/+19574
* | | 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' 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' 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
| |\ \ \ \
* | \ \ \ \ 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 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 '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-05-022-2/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-05-022-2/+2
| |\ \ \ \ \ \
| | * | | | | | Doc: Fixed reference to a name in a table.David Boddie2011-04-111-1/+1
| | * | | | | | qdoc: Updated the QDoc manual.Martin Smith2011-04-071-1/+1
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-05-025-79/+190
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Merge branch '4.7-review' into 4.7-stagingThierry Bastian2011-05-025-79/+190
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Revert "Fix double painting when adding an item into a linear layout"Jan-Arve Sæther2011-04-281-4/+1
| | * | | | | | Merge branch '4.7-upstream' into 4.7Thierry Bastian2011-04-2070-500/+1100
| | |\ \ \ \ \ \