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-04-21 | 1 | -5/+12 |
|\ | |||||
| * | Merge remote-tracking branch 'mainline/master' | Oswald Buddenhagen | 2011-04-21 | 33 | -341/+2622 |
| |\ | |||||
| * | | Use binary search to speed up findChildFrame() | Steffen Hansen | 2011-04-21 | 1 | -5/+12 |
* | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-04-20 | 1 | -0/+3 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-18 | 1 | -0/+3 |
| |\ \ | |||||
| | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-13 | 1 | -0/+3 |
| | |\ \ | |||||
| | | * | | Fix TextEdit cursorRectangle property. | Andrew den Exter | 2011-04-13 | 1 | -0/+3 |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-04-19 | 31 | -339/+2620 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Long live QRawFont! | Eskil Abrahamsen Blomfeldt | 2011-04-19 | 31 | -339/+2620 |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-04-18 | 2 | -2/+2 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master | axis | 2011-04-07 | 13 | -123/+18 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Make sure we don't use subpixel positions in full hinting mode | Jiang Jiang | 2011-04-01 | 1 | -0/+2 |
| * | | | | Compile with QStringBuilder and QByteArray | Olivier Goffart | 2011-04-01 | 1 | -1/+1 |
| * | | | | Chnaged Q_AUTOTEST_EXPORT marco into Q_GUI_EXPORT for QZipWriter class | Pavel Mogilevskiy | 2011-04-01 | 1 | -1/+1 |
| * | | | | Fix horizontal centered text drawing without word wrap | Jiang Jiang | 2011-04-01 | 3 | -18/+18 |
* | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-04-12 | 3 | -1/+11 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-04-11 | 3 | -1/+11 |
| |\ \ \ | |||||
| | * | | | Make sure removed QTextBlock is invalid | Jiang Jiang | 2011-04-11 | 3 | -1/+11 |
| * | | | | Merge remote-tracking branch 'mainline/4.7' into 4.7 | Oswald Buddenhagen | 2011-03-31 | 3 | -3/+6 |
| |\ \ \ \ | |||||
| * | | | | | Ensure the right font is used for rendering text on Mac | Andy Shaw | 2011-03-30 | 1 | -1/+3 |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-04-06 | 11 | -122/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Put all the declarations of qt_defaultDpi{,X,Y}() in one place | Jiang Jiang | 2011-04-05 | 8 | -16/+5 |
| * | | | | | | Fix positioning in GL2 paint engine with subpixel antialiasing | Jiang Jiang | 2011-04-04 | 3 | -106/+10 |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-04-05 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add version attributes as per ODF specification | Tomas Straupis | 2011-03-29 | 1 | -0/+2 |
* | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-04-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-31 | 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-03-28 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | | | |_|/ | | | |/| | | |||||
| | | * | | | Fix text selection with shift-click. | Andrew den Exter | 2011-03-28 | 1 | -1/+1 |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-03-25 | 1 | -1/+4 |
| | |\ \ \ \ | |||||
| | | * | | | | Make sure num_glyphs pass to HarfBuzz is large enough | Jiang Jiang | 2011-03-24 | 1 | -1/+4 |
* | | | | | | | Make sure we don't use subpixel positions in full hinting mode | Jiang Jiang | 2011-04-01 | 1 | -0/+2 |
* | | | | | | | Fix horizontal centered text drawing without word wrap | Jiang Jiang | 2011-03-31 | 3 | -18/+18 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-03-28 | 5 | -96/+158 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Fix crash and infinite recursion caused by previous commits | Jiang Jiang | 2011-03-28 | 2 | -2/+3 |
| * | | | | | Fix remaining regressions in QWS | Jiang Jiang | 2011-03-25 | 2 | -0/+2 |
| * | | | | | Take Xft.hintstyle by default to match the behavior of GTK+ | Jiang Jiang | 2011-03-25 | 1 | -1/+6 |
| * | | | | | Fixed remaining issues in subpixel positioning with FreeType | Jiang Jiang | 2011-03-24 | 2 | -10/+10 |
| * | | | | | unlockFace was put in the wrong place in previous patch | Jiang Jiang | 2011-03-22 | 1 | -2/+2 |
| * | | | | | Implement subpixel positioning with FreeType | Jiang Jiang | 2011-03-22 | 4 | -95/+149 |
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-22 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-03-21 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | |||||
| | * | | Don't crash calling QTextDocument::blockBoundingRect on invalid block | Eskil Abrahamsen Blomfeldt | 2011-03-21 | 1 | -1/+1 |
* | | | | Merge remote branch 'qt/master' into staging-master | Samuel Rødal | 2011-03-21 | 2 | -23/+26 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/master' into lighthouse-master | Jørgen Lind | 2011-03-17 | 15 | -41/+54 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'origin/4.7' into HEAD | Thiago Macieira | 2011-03-16 | 1 | -22/+25 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-03-15 | 1 | -22/+25 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Adjust right bearing when breaking with line separators | Jiang Jiang | 2011-03-15 | 1 | -22/+25 |
| * | | | | | don't print debug output | con | 2011-03-04 | 1 | -1/+1 |
* | | | | | | Only enable RightToLeft forcing in OS X 10.6 and skip the test | Jiang Jiang | 2011-03-16 | 1 | -0/+2 |