summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* don't crash when destroying codec listOswald Buddenhagen2011-08-151-4/+5
* Join user state of removed text blocksLeandro Melo2011-08-151-0/+1
* Missed break of switch-case addedViktor Kolesnyk2011-08-121-0/+1
* 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-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-041-3/+3
|\ \ | |/
| * Fix installation on S60 5.0Shane Kearns2011-08-041-3/+3
* | 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 '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-08-03127-52415/+26133
|\ \ \
| * | | Updating libpng: Patches to libpng 1.5.4 for building it in Qtaavit2011-08-022-5/+18
| * | | Updating libpng: Add libpng version 1.5.4aavit2011-08-0241-0/+59715
| * | | Updating libpng: Remove version 1.4.0aavit2011-08-02124-86010/+0
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-021-107/+0
|\ \ \ \
| * | | | Remove DerivedSources.pro from WebKit.Jocelyn Turcotte2011-08-021-107/+0
* | | | | 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 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 branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-211-11/+20
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fixed crash when loading 16 bits-per-pixel grayscale TIFs.Kim Motoyoshi Kalland2011-07-201-11/+20
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-211-0/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix compilation on Symbian platforms without SgImage supportJani Hautakangas2011-07-211-0/+4
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-191-0/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Check for buffer overflow in Lookup_MarkMarkPosJiang Jiang2011-07-191-0/+3
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-07-193-4/+78
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Delay masking the last character in Password echo mode.Andrew den Exter2011-07-193-4/+78
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-182-2/+15
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Prevent failed rendering for NPOT textures in GLES2.Samuel Rødal2011-07-181-1/+3
| * | | | Don't use GL_REPEAT for NPOT textures in GLES2.Samuel Rødal2011-07-181-1/+12
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-182-3/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Avoid crash when surface creation fails.Laszlo Agocs2011-07-182-3/+3
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-181-0/+6
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fixes leaking X11 SyncCounter when widgets get open/destroyedAleksandar Stojiljkovic2011-07-181-0/+6
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-131-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix potential crash when clicking in a text editEskil Abrahamsen Blomfeldt2011-07-131-0/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-121-2/+8
|\ \ \ \ \ | |/ / / /
| * | | | Compensate for different rounding rule in CG engineJiang Jiang2011-07-121-2/+8
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-123-44/+117
|\ \ \ \ \ | |/ / / /
| * | | | Check engine existence before increasing reference countJiang Jiang2011-07-121-3/+6