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-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
* | | | | | 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
| * | | | | Keep reference count for cached font engines in QTextEngineJiang Jiang2011-07-111-0/+15
| * | | | | Optimize text layout.Michael Brasser2011-07-113-25/+71
| * | | | | Fix crash when app font is addedJiang Jiang2011-07-113-19/+28
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-115-2/+13
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Backporting fix for QTBUG-18716Tomi Vihria2011-07-115-2/+13
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-112-9/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fixing WINSCW compile errormread2011-07-112-9/+14
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-07-081-0/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | sync win32-g++-cross with win32-g++ (lib prefix and extension)Mark Brand2011-07-081-0/+2
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-07-087-164/+274
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Flicking behaviour of ListView/GridView SnapOnItem is inconsistentMartin Jones2011-07-085-153/+200
| * | | | | Skip flick velocity test on Mac.Martin Jones2011-07-081-0/+4
| * | | | | Try again to fix flickable velocity on Mac.Martin Jones2011-07-081-0/+1
| * | | | | Try to fix Mac CI test failureMartin Jones2011-07-081-2/+2
| * | | | | Flickable is too sensitive.Martin Jones2011-07-081-1/+5
| * | | | | Reduce timing dependancy in flickable testMartin Jones2011-07-082-49/+22
| * | | | | Velocities reported by Flickable in onFlickStarted can be 0Martin Jones2011-07-082-9/+90
| | |_|_|/ | |/| | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-071-0/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix memory leak in QHostInfoShane Kearns2011-07-071-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-071-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Regression: Some QMenus are shown completely transparent in SymbianSami Merila2011-07-071-1/+3
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-07-071-0/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Update the Window title when closing the last tab.Casper van Donderen2011-07-071-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-061-1/+13
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix bidi reordering when part of text is rendered by fallback fontEskil Abrahamsen Blomfeldt2011-07-061-1/+13
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-061-1/+6
|\ \ \ \ \ | | |_|/ / | |/| | |