Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Doc: Fixed qdoc warnings. | David Boddie | 2011-08-15 | 6 | -10/+42 |
* | 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 |
| | * | | | Reset previousGlyph once we reached a new text item | Jiang Jiang | 2011-07-25 | 1 | -0/+1 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-07-27 | 2 | -9/+62 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | |||||
| | * | | Symbian^3 workaround: Avoid usage of linked fonts. | Alessandro Portale | 2011-07-27 | 2 | -9/+62 |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-07-21 | 2 | -2/+9 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Move separator skipping to proper place | Jiang Jiang | 2011-07-19 | 2 | -6/+7 |
| * | | | Skip shaping for hidden line/paragraph separators | Jiang Jiang | 2011-07-19 | 1 | -0/+6 |
| * | | | Apply 57993ba7 properly to 4.8 | Jiang Jiang | 2011-07-14 | 1 | -1/+1 |
| * | | | Fix warning for uninitialized variable | Jiang Jiang | 2011-07-12 | 1 | -1/+1 |
* | | | | namespace fix | Joerg Bornemann | 2011-07-14 | 1 | -1/+2 |
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-07-14 | 1 | -0/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Fix potential crash when clicking in a text edit | Eskil Abrahamsen Blomfeldt | 2011-07-13 | 1 | -0/+1 |
| * | | | Check engine existence before increasing reference count | Jiang Jiang | 2011-07-12 | 1 | -3/+6 |
| * | | | Keep reference count for cached font engines in QTextEngine | Jiang Jiang | 2011-07-11 | 1 | -0/+15 |
| * | | | Optimize text layout. | Michael Brasser | 2011-07-11 | 3 | -25/+71 |
| * | | | Fix crash when app font is added | Jiang Jiang | 2011-07-11 | 3 | -19/+28 |
| * | | | Fix horizontal center alignment with trailing space | Jiang Jiang | 2011-07-04 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-07-12 | 5 | -23/+33 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix compiler warning in qtextdocument.cpp | Eskil Abrahamsen Blomfeldt | 2011-07-11 | 1 | -1/+1 |
| * | | Fix crash when app font is added | Jiang Jiang | 2011-07-11 | 3 | -19/+28 |
| * | | Use truncate only for subpixel boundingBox x position | Jiang Jiang | 2011-07-08 | 1 | -1/+1 |
| * | | Revert 344a4dcfe and part of 93bce787 | Jiang Jiang | 2011-07-07 | 1 | -3/+4 |
| * | | Fix raster subpixel positioning in Lion | Jiang Jiang | 2011-07-07 | 1 | -1/+1 |
| * | | Merge remote branch 'mainline/4.8' | Jiang Jiang | 2011-07-07 | 3 | -165/+73 |
| |\ \ | |||||
* | \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master... | Qt Continuous Integration System | 2011-07-08 | 4 | -4/+18 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote branch 'upstream/4.8' | Jerome Pasion | 2011-07-08 | 3 | -165/+73 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Doc: Updated documentation with \since 4.8 declarations. | David Boddie | 2011-06-30 | 4 | -4/+18 |
* | | | | | Merge remote branch 'mainline/4.8' into staging | Jiang Jiang | 2011-07-08 | 3 | -165/+73 |
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | |||||
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-07-02 | 2 | -162/+66 |
| |\ \ \ | |||||
| | * | | | Compile with DEBUG_FONTENGINE define | Harald Fernengel | 2011-07-01 | 1 | -4/+4 |
| | * | | | minor optimization | Ritt Konstantin | 2011-07-01 | 1 | -2/+2 |
| | * | | | remove the old compatibility code | Ritt Konstantin | 2011-07-01 | 1 | -95/+2 |
| | * | | | make QFontEngineQPF1 work even without mmap(2) support | Ritt Konstantin | 2011-07-01 | 1 | -62/+59 |
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-07-01 | 1 | -3/+7 |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-06-29 | 1 | -3/+7 |
| | |\ \ |