summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-159-13/+37
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-058-12/+32
| |\
| | * Fix compile errors on S60 3.2Shane Kearns2011-08-056-11/+11
| | * Fix to QGLWidget rendering with VG graphics systemJani Hautakangas2011-08-052-1/+21
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-041-2/+6
| |\ \
| | * | Move cursorDelegate with the mouse selection of read only text input.Andrew den Exter2011-08-041-2/+6
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-111-2/+2
|\ \ \ \
| * | | | Don't leak MouseEventsAlan Alpert2011-08-111-2/+2
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-111-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Don't endless loopAlan Alpert2011-08-091-1/+1
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamHonglei Zhang2011-08-043-5/+5
|\ \ \ \ \
| * | | | | Preventing QSoftkeyManager giving false positive memory leaksmread2011-08-022-4/+4
| * | | | | Fixed memory leak in QMessageBox::setInformativeText in Symbianmread2011-08-021-1/+1
* | | | | | Merge remote-tracking branch 'qt/4.8'Honglei Zhang2011-08-0427-201/+360
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-032-5/+10
| |\ \ \ \
| | * | | | Fixed compile error in qwindowsurface_qws.cpp.Samuel Rødal2011-08-031-1/+1
| | * | | | Fixed regression introduced by 5842d19cf3dff37a85c.Samuel Rødal2011-08-031-4/+9
| * | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-08-0321-169/+285
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-08-021-0/+7
| | |\ \ \ \ \
| | | * | | | | QLabel documentation: add warning about sanitizing inputPeter Hartmann2011-08-021-0/+7
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-08-021-0/+4
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-296-31/+88
| | | |\ \ \ \ \ \
| | | * | | | | | | Fix typo for ifdef QT_NO_ACCESSIBILITYFrederik Gladhorn2011-07-291-1/+1
| | | * | | | | | | Call QAccessible::updateAccessibility when a widget is deletedJosé Millán Soto2011-07-291-0/+4
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-0119-169/+274
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | / / / / | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Include trailing space width in RTL text line widthJiang Jiang2011-07-261-1/+5
| | | * | | | | | Fixed holes in border image drawing by introducing new API.Samuel Rødal2011-07-268-133/+171
| | | * | | | | | Get subpixel antialiasing again w/combo of raster and affine transformEskil Abrahamsen Blomfeldt2011-07-251-9/+3
| | | * | | | | | Add initial support for bitmap version 4/5 headers.Ilya Konkov2011-07-221-9/+55
| | | * | | | | | optimize QRawFont::supportsCharacter()Ritt Konstantin2011-07-222-4/+15
| | | * | | | | | Merge remote branch 'mainline/4.8'Jiang Jiang2011-07-2240-117/+898
| | | |\ \ \ \ \ \
| | | * | | | | | | Switch to use floating point pixelSize in QRawFont completelyJiang Jiang2011-07-217-13/+13
| | | * | | | | | | Add a way to check if we have a matching family in the database.Pierre Rossi2011-07-212-0/+12
| * | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-021-21/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | / / / | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-021-21/+2
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Detect linked fonts by name (insead of via CLinkedTypeface* Api)Alessandro Portale2011-08-021-21/+2
| * | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-296-31/+88
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | / / / | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-281-12/+6
| | |\ \ \ \ \ \
| | | * | | | | | Revert binary search in QTextEngine::findItemJiang Jiang2011-07-281-12/+6
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-271-1/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Remove a duplicate include lineLiang Qi2011-07-271-1/+0
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-273-9/+20
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Save previous font engine for right bearing adjustmentJiang Jiang2011-07-271-5/+15
| | | * | | | | | Fix compilation under OSX 10.7 or using llvm-gcc.Mike McQuaid2011-07-261-4/+4
| | | * | | | | | Fix typo in QFontDialog docsJiang Jiang2011-07-251-1/+1
| | | * | | | | | Reset previousGlyph once we reached a new text itemJiang Jiang2011-07-251-0/+1
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-272-9/+62
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Symbian^3 workaround: Avoid usage of linked fonts.Alessandro Portale2011-07-272-9/+62
* | | | | | | | | Merge remote-tracking branch 'qt/4.8'Honglei Zhang2011-07-2975-268/+1050
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-07-2518-55/+392
| |\ \ \ \ \ \ \ \