summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-031-1/+6
|\
| * Ignore child elements in non-application caption/pkg name translationsMiikka Heikkinen2011-08-031-1/+6
* | 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-022-0/+7
|\ \ \ | | |/ | |/|
| * | Support debuggable in the makefile build systemLiang Qi2011-08-021-0/+5
| * | Mark all Symbian debug binaries debuggable by defaultMiikka Heikkinen2011-08-021-0/+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 branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-08-020-0/+0
|\ \ \
| * \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-1212-71/+144
| |\ \ \
| * \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-0812-166/+294
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-069-17/+49
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-0693-1707/+2377
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-06-2896-353/+1983
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ 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-195-4/+190
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Delay masking the last character in Password echo mode.Andrew den Exter2011-07-195-4/+190
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2011-07-1944-0/+1698
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Updated license headers.Toby Tomkins2011-07-1922-425/+425
| * | | | | | | | | | | Add system tests from research:systemtests repository.Toby Tomkins2011-07-1244-0/+1698
* | | | | | | | | | | | 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-1 into 4.7-integ...Qt Continuous Integration System2011-07-122-16/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Remove broken link to Symbian.org documentation.Casper van Donderen2011-07-122-16/+0