Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-27 | 18 | -136/+58 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | | | ||||||
| | | | * | | | | | | | | | | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA... | Joona Petrell | 2011-05-27 | 18 | -136/+58 | |
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-26 | 82 | -10/+7650 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | | | ||||||
| | | | * | | | | | | | | | | Fixed more CI-errors caused by qmlshadersplugin addition. | Marko Niemelä | 2011-05-26 | 3 | -1/+83 | |
| | | | * | | | | | | | | | | Fixed CI-errors caused by qmlshadersplugin addition. | Marko Niemelä | 2011-05-26 | 44 | -70/+315 | |
| | | | * | | | | | | | | | | Fixing Linux compatibility issues for Symbian | Tomi Vihria | 2011-05-25 | 9 | -39/+51 | |
| | | | * | | | | | | | | | | Update the detection of is_using_gnupoc for S3. | Liang Qi | 2011-05-25 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | Backported QML ShaderEffectItem from QML2.0 into Qt Quick 1.1 | Marko Niemelä | 2011-05-25 | 74 | -1/+7285 | |
| | | | * | | | | | | | | | | Revert "Fixing Linux compatibility issues for Symbian" | Laszlo Agocs | 2011-05-25 | 12 | -44/+57 | |
| | | | * | | | | | | | | | | sockets: limit buffer size of the internal sockets in proxy engines | Shane Kearns | 2011-05-24 | 2 | -0/+4 | |
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-05-25 | 4 | -7/+106 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | | | ||||||
| | | | * | | | | | | | | | | Fix boundry conditions for cursor hit test | Jiang Jiang | 2011-05-25 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | Fix cursor position test on CursorOnCharacter case | Jiang Jiang | 2011-05-25 | 3 | -4/+9 | |
| | | | * | | | | | | | | | | Merge remote branch 'mainline/4.7' into 4.7 | Jiang Jiang | 2011-05-24 | 31 | -498/+644 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | Fix xToCursor issue due to backporting from 4.8 | Jiang Jiang | 2011-05-24 | 1 | -0/+2 | |
| | | | * | | | | | | | | | | | Support placing cursor in ligature with mouse or touch | Jiang Jiang | 2011-05-23 | 4 | -7/+99 | |
| | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-25 | 1 | -1/+11 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | fix the "Host" header for ipv6 URLs in QNAM | shiroki | 2011-05-25 | 1 | -1/+11 | |
| | * | | | | | | | | | | | | | Merge branch '4.8' into qt-4.8-from-4.7 | Liang Qi | 2011-05-27 | 77 | -1133/+1560 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-05-25 | 2 | -1/+7 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-25 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | Flickable could flick in wrong direction if given too few touch samples | Martin Jones | 2011-05-25 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-25 | 1 | -0/+6 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / | | | | |/| | | / / / / / / / / | | | | |_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | Fix the state of default network configuration. | Xizhi Zhu | 2011-05-24 | 1 | -0/+6 | |
| | * | | | | | | | | | | | | | Fix broken drawing with large fonts using QStaticText and FreeType | Eskil Abrahamsen Blomfeldt | 2011-05-24 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-24 | 22 | -1029/+1148 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-22 | 11 | -215/+215 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | Absenting function in winscw def files. | Laszlo Agocs | 2011-05-20 | 11 | -215/+215 | |
| | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-05-20 | 2 | -22/+61 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | / / / / / / / | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | | | ||||||
| | | | * | | | | | | | | | | Fix ligature offset in multi-line text | Jiang Jiang | 2011-05-20 | 2 | -2/+19 | |
| | | | * | | | | | | | | | | Make selection work across ligatures | Jiang Jiang | 2011-05-20 | 1 | -21/+43 | |
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-20 | 3 | -36/+33 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | | | ||||||
| | | | * | | | | | | | | | | Notify when the TextInput cursorRectangle property changes within pre-edit | Andrew den Exter | 2011-05-20 | 3 | -36/+33 | |
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-19 | 1 | -2/+2 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | | | ||||||
| | | | * | | | | | | | | | | Fix brush transform in QtDirectFB backend, fixing QTBUG-18577 | Denis Oliver Kropp | 2011-05-19 | 1 | -2/+2 | |
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-19 | 2 | -137/+299 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | directfb: Paint engine enhancements | Denis Oliver Kropp | 2011-05-19 | 2 | -137/+299 | |
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-18 | 12 | -57/+44 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | Fixing Linux compatibility issues for Symbian | Tomi Vihria | 2011-05-18 | 12 | -57/+44 | |
| | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-05-18 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | Fix broken drawing with large fonts using QStaticText and FreeType | Eskil Abrahamsen Blomfeldt | 2011-05-18 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-06-08 | 84 | -1561/+3107 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team | Qt Continuous Integration System | 2011-06-08 | 8551 | -150102/+154524 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | Fix compile when configure with no fontconfig support | Jiang Jiang | 2011-06-08 | 1 | -3/+3 | |
| | | * | | | | | | | | | | | | | Fix warning in qtextengine compilation | Jiang Jiang | 2011-06-08 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | Reorder member varibles in QGlyphRunPrivate to eliminate warning | Jiang Jiang | 2011-06-08 | 1 | -4/+4 | |
| | | * | | | | | | | | | | | | | Revert 36e01e69 | Jiang Jiang | 2011-06-08 | 1 | -4/+0 | |
| | | * | | | | | | | | | | | | | Fixed compile of tst_qscriptextensionplugin on some Windows configurations | Rohan McGovern | 2011-06-07 | 1 | -0/+1 | |
| | | * | | | | | | | | | | | | | Add function QGlyphRun::setRawData() | Eskil Abrahamsen Blomfeldt | 2011-06-06 | 7 | -53/+190 | |
| | | * | | | | | | | | | | | | | Merge remote branch 'qt/4.8' into fire-master | Paul Olav Tvete | 2011-06-06 | 8550 | -150045/+154333 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | |