summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into qtquick2history/qtquick2axis2011-04-274-28/+27
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-273-25/+26
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-271-10/+6
| | |\
| | | * Ignore changes to selectByMouse during a selection.Andrew den Exter2011-04-271-10/+6
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-274-33/+37
| | |\ \
| | | * | Let QTextLine decide its own x position in QPainterJiang Jiang2011-04-194-22/+26
| | | * | Support text decoration in QML when using static text back-endEskil Abrahamsen Blomfeldt2011-04-181-11/+11
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-261-4/+9
| | |\ \ \
| | | * | | Input method hints are not correct if using proxy widgetSami Merila2011-04-261-4/+9
| * | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-04-271-3/+1
| |\ \ \ \ \
| | * | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-271-3/+1
| | |\| | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-261-3/+1
| | | |\| | |
| | | | * | | Set QPixmapCache default limit to 10MB on Symbian.Jani Hautakangas2011-04-261-3/+1
* | | | | | | Update SceneGraph to use QRawFont APIEskil Abrahamsen Blomfeldt2011-04-261-1/+1
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into qtquick2axis2011-04-2662-589/+3144
|\| | | | | |
| * | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-04-231-1/+9
| |\| | | | |
| | * | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-231-1/+9
| | |\| | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-211-1/+9
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Fix TextInput cursor position unchanged when selection length is 0.Andrew den Exter2011-04-211-1/+9
| * | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-04-223-12/+12
| |\| | | | |
| | * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-213-12/+12
| | |\| | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-212-11/+11
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | Build break fix for simulated QS60StyleSami Merila2011-04-202-11/+11
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-201-1/+1
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | Fix excessive scrolling in TextInput with mid string pre-edit text.Andrew den Exter2011-04-191-1/+1
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-211-5/+12
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-04-2149-456/+2940
| | |\ \ \ \ \
| | * | | | | | Use binary search to speed up findChildFrame()Steffen Hansen2011-04-211-5/+12
| * | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-2113-101/+344
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-211-1/+1
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-201-1/+1
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | Symbol table is very limited in numeric input modeSami Merila2011-04-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-04-181-0/+2
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | Fix build of Qt/DirectFB without graphics view support.Denis Oliver Kropp2011-04-181-0/+2
| | * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-1813-100/+343
| | |\| | | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-161-1/+1
| | | |\| | | |
| | | | * | | | QDesktopServices::openUrl() doesn't handle URL encodings correctlyCarlos Manuel Duclos Vergara2011-04-151-1/+1
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-156-12/+120
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| / / / | | | | |/ / /
| | | | * | | Build fix for transition effect support on S60 5.0.Laszlo Agocs2011-04-152-3/+9
| | | | * | | Make EGL surface transparency working on Symbian.Laszlo Agocs2011-04-151-3/+8
| | | | * | | Splitview flag should also be updated to inputcontextSami Merila2011-04-141-0/+22
| | | | * | | QGraphicsView with vertical scrollbar flickers when splitview opensSami Merila2011-04-141-2/+6
| | | | * | | Splitview: opening a context menu should not re-position of focusItemSami Merila2011-04-141-4/+4
| | | | * | | Trigger fullscreen transition effects properly on app exit.Laszlo Agocs2011-04-143-3/+72
| | | | * | | Do not use SetSurfaceTransparency() on raster.Laszlo Agocs2011-04-141-0/+2
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-141-0/+3
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Fix TextEdit cursorRectangle property.Andrew den Exter2011-04-131-0/+3
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-141-1/+1
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | Predictive Text causing app to crash after repeated edit attemptsSami Merila2011-04-131-1/+1
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-138-86/+218
| | | |\| | |