summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-upstream'Thierry Bastian2011-03-1077-207/+2871
|\
| * Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-102-2/+2
| |\
| | * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-092-2/+2
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-091-1/+1
| | | |\
| | | | * Update TextEdit's visible selection when only the anchor changes.Andrew den Exter2011-03-081-1/+1
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-081-1/+1
| | | |\ \
| | | | * | Fixed memory leak in GL texture cache with QRuntimePixmapData.Samuel Rødal2011-03-071-1/+1
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-092-11/+9
| |\ \ \ \ \
| | * | | | | Removed obsolete documentation from QPixmap.Samuel Rødal2011-03-071-10/+0
| | * | | | | Fixed auto-test failures caused by a3a79fefe65ec12.Samuel Rødal2011-03-071-2/+5
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-03-042-1/+6
| | |\ \ \ \ \
| | | * | | | | Place cursor at the end of the selected rangeJiang Jiang2011-03-041-1/+1
| | | * | | | | Fail in a nicer way when QPixmap is used in a non-GUI application.Samuel Rødal2011-03-041-0/+5
| * | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-082-2/+7
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-042-2/+7
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-041-0/+3
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | Added image conversion flag to prevent conversions.Samuel Rødal2011-03-041-0/+3
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-041-2/+4
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | Fix potential crash in QTextControl.Lasse Holmstedt2011-03-041-2/+4
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-083-1/+15
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Fix preprocessor directive.Fabien Freling2011-03-041-1/+1
| | * | | | | | Fix compiling issue on Lion.Fabien Freling2011-03-042-0/+14
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-03-042-2/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge remote branch 'earth/master' into masterJoão Abecasis2011-02-282-2/+1
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-02-2458-277/+608
| | | |\ \ \ \ \ \
| | | * | | | | | | Check engine existence before increasing reference countJiang Jiang2011-02-241-3/+6
| | | * | | | | | | Keep reference count for cached font engines in QTextEngineJiang Jiang2011-02-241-0/+15
| | | * | | | | | | Avoid warning when seting a window iconOlivier Goffart2011-02-211-1/+1
| | | * | | | | | | Remove useless processEventOlivier Goffart2011-02-171-1/+0
| * | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-0312-11/+1162
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-031-3/+3
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Use the generic QVoltileImage implementation on S60 3.1 and 3.2.Laszlo Agocs2011-03-031-3/+3
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-031-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | / / / | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | Position the TextInput cursor correctly after IM text is commited.Andrew den Exter2011-03-031-1/+1
| | * | | | | | | | Have QVolatileImage backed by a bitmap in all cases.Laszlo Agocs2011-03-011-5/+3
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-03-0141-189/+347
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Add internal function for releasing cached GPU resources.Jani Hautakangas2011-03-012-0/+7
| | * | | | | | | | | Changed QPixmap VG backend to use CFbsBitmap on Symbian.Laszlo Agocs2011-02-289-10/+1156
| * | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-013-9/+12
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-013-9/+12
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | / / / | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-282-7/+13
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / | | | | |/| | | | | |
| | | | * | | | | | | Fix Mac synthesized italic fonts clipping issue for QGLWidgetJiang Jiang2011-02-281-5/+10
| | | | * | | | | | | Merge branch 'graphics-team-text-4.7' into 4.7Eskil Abrahamsen Blomfeldt2011-02-281-2/+3
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Fix cursor position adjustment when removing stringsJiang Jiang2011-01-251-1/+3
| | | | | * | | | | | | Fix out of bounds handling in Mac shaperJiang Jiang2011-01-141-2/+3
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-252-7/+9
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | QSortFilterProxyModel::reset() should invalidate.Olivier Goffart2011-02-252-7/+9
| * | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-014-0/+32
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | / | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-02-284-0/+32
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Resolve font alias before testing for exact matchingJiang Jiang2011-02-284-0/+32
generated by cgit v0.12 at 2024-11-28 16:47:42 (GMT)