Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-09-07 | 1 | -0/+8 |
|\ | |||||
| * | Fix the build with -qtnamespace configure options | suzuki toshiya | 2011-09-06 | 1 | -0/+8 |
* | | Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7 | Sergio Ahumada | 2011-08-31 | 13 | -43/+94 |
|\ \ | |/ | |||||
| * | Merge remote-tracking branch 'upstream/4.8' | Sergio Ahumada | 2011-08-29 | 7 | -44/+56 |
| |\ | |||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-08-28 | 5 | -13/+23 |
| | |\ | |||||
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team | aavit | 2011-08-24 | 5 | -13/+23 |
| | | |\ | |||||
| | | | * | Revert "Include trailing space width in RTL text line width" | Eskil Abrahamsen Blomfeldt | 2011-08-24 | 1 | -5/+1 |
| | | | * | Fix justification of RTL text | Eskil Abrahamsen Blomfeldt | 2011-08-24 | 1 | -1/+2 |
| | | | * | Use CoreText for font rendering on uikit. | Eike Ziller | 2011-08-24 | 3 | -7/+20 |
| | * | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-08-27 | 2 | -31/+33 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Merge remote-tracking branch 'mainline/4.8' | Oswald Buddenhagen | 2011-08-26 | 7 | -12/+42 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master... | Qt Continuous Integration System | 2011-08-19 | 6 | -10/+42 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | Doc: Fixed qdoc warnings. | David Boddie | 2011-08-15 | 6 | -10/+42 |
| | * | | | Merge remote-tracking branch 'qt-mainline/4.8' | aavit | 2011-08-16 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'qt-mainline/4.8' | aavit | 2011-08-16 | 2 | -3/+7 |
| | |\ \ \ \ | |||||
| | * | | | | | Fix bidi reordering of RTL text with embedded images | Eskil Abrahamsen Blomfeldt | 2011-08-16 | 1 | -2/+0 |
| * | | | | | | Merge remote-tracking branch 'mainline/4.8' | Oswald Buddenhagen | 2011-08-18 | 4 | -20/+33 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-08-16 | 1 | -17/+25 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | / / / | | | |_|/ / / | | |/| | | | | |||||
| | | * | | | | Minor optimizations for QTextEngine | Ritt Konstantin | 2011-08-08 | 1 | -17/+25 |
| | | | |/ / | | | |/| | | |||||
| * | | | | | Add support for rawFonts loaded from data in FaceId | Pierre Rossi | 2011-08-15 | 2 | -1/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Sergio Ahumada | 2011-08-31 | 1 | -11/+19 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Make text rendering working outside the gui thread on Symbian. | Laszlo Agocs | 2011-08-30 | 1 | -11/+19 |
* | | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Sergio Ahumada | 2011-08-26 | 2 | -31/+33 |
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-08-24 | 1 | -19/+11 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-08-24 | 1 | -12/+22 |
| |\ \ \ \ | |||||
| | * | | | | Make it easier to select words at the start of a line. | Andrew den Exter | 2011-08-24 | 1 | -12/+22 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-08-22 | 1 | -11/+19 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Make text rendering working outside the gui thread on Symbian. | Laszlo Agocs | 2011-08-16 | 1 | -11/+19 |
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-08-16 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | |||||
| * | | | | Join user state of removed text blocks | Leandro Melo | 2011-08-15 | 1 | -0/+1 |
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-08-15 | 2 | -3/+7 |
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-08-05 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix compile errors on S60 3.2 | Shane Kearns | 2011-08-05 | 1 | -1/+1 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-08-04 | 1 | -2/+6 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Move cursorDelegate with the mouse selection of read only text input. | Andrew den Exter | 2011-08-04 | 1 | -2/+6 |
* | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7 | Liang Qi | 2011-08-03 | 10 | -18/+45 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-08-01 | 10 | -18/+45 |
| |\ \ \ \ | |||||
| | * | | | | Include trailing space width in RTL text line width | Jiang Jiang | 2011-07-26 | 1 | -1/+5 |
| | * | | | | optimize QRawFont::supportsCharacter() | Ritt Konstantin | 2011-07-22 | 2 | -4/+15 |
| | * | | | | Merge remote branch 'mainline/4.8' | Jiang Jiang | 2011-07-22 | 6 | -5/+21 |
| | |\ \ \ \ | |||||
| | * | | | | | Switch to use floating point pixelSize in QRawFont completely | Jiang Jiang | 2011-07-21 | 7 | -13/+13 |
| | * | | | | | Add a way to check if we have a matching family in the database. | Pierre Rossi | 2011-07-21 | 2 | -0/+12 |
* | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-08-02 | 1 | -21/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-08-02 | 1 | -21/+2 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Detect linked fonts by name (insead of via CLinkedTypeface* Api) | Alessandro Portale | 2011-08-02 | 1 | -21/+2 |
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-07-29 | 4 | -27/+84 |
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-07-28 | 1 | -12/+6 |
| |\ \ \ \ | |||||
| | * | | | | Revert binary search in QTextEngine::findItem | Jiang Jiang | 2011-07-28 | 1 | -12/+6 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-07-27 | 1 | -4/+15 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Save previous font engine for right bearing adjustment | Jiang Jiang | 2011-07-27 | 1 | -5/+15 |