summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-06-068-234/+192
|\
| * drop the SysV semaphores -specific code out from QWSSignalHandlerRitt Konstantin2011-06-014-54/+54
| * minor refactoring of the QWSLock classRitt Konstantin2011-06-012-68/+47
| * simplify the code by using the EINTR_LOOP macroRitt Konstantin2011-06-011-36/+36
| * simplify the semaphores initializationRitt Konstantin2011-06-011-17/+6
| * minor refactoring of the QLock classRitt Konstantin2011-06-011-82/+46
| * add a warning on an incorrect usage of QLockRitt Konstantin2011-06-011-0/+2
| * make sure we really clear all locksRitt Konstantin2011-06-011-1/+1
| * fix build with QT_NO_QWS_SIGNALHANDLERRitt Konstantin2011-06-014-5/+29
| * Fix build in C++0x modeBernhard Rosenkraenzer2011-05-313-8/+8
* | Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-06-011-3/+3
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-011-3/+3
| |\ \
| | * | Fix pixel metrics for Symbian VGA devicesSami Merila2011-05-311-3/+3
* | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-3112-39/+98
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-303-26/+38
| |\ \ \ | | |/ /
| | * | Fix for BCM2727 chip detection on SymbianJani Hautakangas2011-05-303-25/+37
| | * | Fix QMenuBar autotest failures for SymbianSami Merila2011-05-301-1/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-287-11/+50
| |\ \ \ | | |/ /
| | * | Documented Symbian peculiarity about QDesktopWidget::availableGeometryMiikka Heikkinen2011-05-271-0/+10
| | * | Fix non-Symbian builds broken by previous commit.Miikka Heikkinen2011-05-273-6/+6
| | * | Fix SYMBIAN_VERSION_* ifdeffingMiikka Heikkinen2011-05-274-9/+9
| | * | Predictive text is not committed when writing in a QLineEditSami Merila2011-05-262-2/+31
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-262-2/+10
| |\ \ \ | | |/ /
| | * | Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-251-1/+5
| | * | Revert "Fixing Linux compatibility issues for Symbian"Laszlo Agocs2011-05-252-2/+6
| * | | Fix boundry conditions for cursor hit testJiang Jiang2011-05-251-1/+1
| * | | 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
| |\ \ \
| * | | | 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
* | | | | Merge branch '4.8' into qt-4.8-from-4.7Liang Qi2011-05-271-6/+22
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-241241-21059/+21172
| |\ \ \ \
| * | | | | Fix in-process drag-n-drop of image data, image/* was not available.David Faure2011-05-191-6/+22
* | | | | | Fix broken drawing with large fonts using QStaticText and FreeTypeEskil Abrahamsen Blomfeldt2011-05-241-1/+1
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-242-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-201-22/+44
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | Fix ligature offset in multi-line textJiang Jiang2011-05-201-2/+2
| | * | Make selection work across ligaturesJiang Jiang2011-05-201-21/+43
| * | | 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
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix broken drawing with large fonts using QStaticText and FreeTypeEskil Abrahamsen Blomfeldt2011-05-181-1/+1
| * | | | Re-apply licenseheader text in source files for qt4.7Jyri Tahtela2011-05-183-51/+51
| |/ / /
| * | | 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 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-05-191241-21057/+21170
|\ \ \ \ \
| * | | | | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-05-181-17/+17
| * | | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-1870-4462/+560
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131246-21159/+21159
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-05-191-1/+1
|\ \ \ \ \ \