summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-2718-136/+58
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA...Joona Petrell2011-05-2718-136/+58
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-2682-10/+7650
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Fixed more CI-errors caused by qmlshadersplugin addition.Marko Niemelä2011-05-263-1/+83
| | | | * | | | | | | | | | Fixed CI-errors caused by qmlshadersplugin addition.Marko Niemelä2011-05-2644-70/+315
| | | | * | | | | | | | | | Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-259-39/+51
| | | | * | | | | | | | | | Update the detection of is_using_gnupoc for S3.Liang Qi2011-05-251-1/+1
| | | | * | | | | | | | | | Backported QML ShaderEffectItem from QML2.0 into Qt Quick 1.1Marko Niemelä2011-05-2574-1/+7285
| | | | * | | | | | | | | | Revert "Fixing Linux compatibility issues for Symbian"Laszlo Agocs2011-05-2512-44/+57
| | | | * | | | | | | | | | sockets: limit buffer size of the internal sockets in proxy enginesShane Kearns2011-05-242-0/+4
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-254-7/+106
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | 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-2431-498/+644
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | 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-234-7/+99
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-251-1/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | fix the "Host" header for ipv6 URLs in QNAMshiroki2011-05-251-1/+11
| | * | | | | | | | | | | | | Merge branch '4.8' into qt-4.8-from-4.7Liang Qi2011-05-2777-1133/+1560
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-252-1/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-251-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | Flickable could flick in wrong direction if given too few touch samplesMartin Jones2011-05-251-1/+1
| | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-251-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / | | | | |/| | | / / / / / / / / | | | | |_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | Fix the state of default network configuration.Xizhi Zhu2011-05-241-0/+6
| | * | | | | | | | | | | | | 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-2422-1029/+1148
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-2211-215/+215
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | Absenting function in winscw def files.Laszlo Agocs2011-05-2011-215/+215
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-202-22/+61
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | / / / / / / / | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Fix ligature offset in multi-line textJiang Jiang2011-05-202-2/+19
| | | | * | | | | | | | | | Make selection work across ligaturesJiang Jiang2011-05-201-21/+43
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-203-36/+33
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Notify when the TextInput cursorRectangle property changes within pre-editAndrew den Exter2011-05-203-36/+33
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-191-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Fix brush transform in QtDirectFB backend, fixing QTBUG-18577Denis Oliver Kropp2011-05-191-2/+2
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-192-137/+299
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | directfb: Paint engine enhancementsDenis Oliver Kropp2011-05-192-137/+299
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-1812-57/+44
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-1812-57/+44
| | | * | | | | | | | | | | | 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
| * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-0884-1561/+3107
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-088551-150102/+154524
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Fix compile when configure with no fontconfig supportJiang Jiang2011-06-081-3/+3
| | | * | | | | | | | | | | | | Fix warning in qtextengine compilationJiang Jiang2011-06-081-1/+1
| | | * | | | | | | | | | | | | Reorder member varibles in QGlyphRunPrivate to eliminate warningJiang Jiang2011-06-081-4/+4
| | | * | | | | | | | | | | | | Revert 36e01e69Jiang Jiang2011-06-081-4/+0
| | | * | | | | | | | | | | | | Fixed compile of tst_qscriptextensionplugin on some Windows configurationsRohan McGovern2011-06-071-0/+1
| | | * | | | | | | | | | | | | Add function QGlyphRun::setRawData()Eskil Abrahamsen Blomfeldt2011-06-067-53/+190
| | | * | | | | | | | | | | | | Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-068550-150045/+154333
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | |