Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-04-14 | 2 | -5/+12 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-04-13 | 2 | -5/+12 |
| |\ | |||||
| | * | doc: Clarify effect of QFont::NoFontMerging | Eskil Abrahamsen Blomfeldt | 2010-04-13 | 1 | -3/+5 |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-04-12 | 1 | -2/+7 |
| | |\ | |||||
| | | * | Merge commit 'internal-qt-repo/4.7' into oslo-staging-2/4.7 | Tom Cooksey | 2010-04-12 | 1 | -1/+3 |
| | | |\ | |||||
| | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-04-10 | 1 | -2/+7 |
| | | |\ \ | |||||
| | | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-03-30 | 11 | -87/+195 |
| | | | |\ \ | |||||
| | | | * | | | Fix use of bitmap fonts on some Linux systems | Eskil Abrahamsen Blomfeldt | 2010-03-30 | 1 | -2/+7 |
* | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-04-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-04-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | CSS: fixes border only affecting the first widget. | Olivier Goffart | 2010-04-12 | 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 | 2010-04-13 | 1 | -7/+25 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-04-12 | 1 | -7/+25 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-04-10 | 1 | -7/+25 |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | | * | | | | Fix QTextDocument::undo() cursor positioning | mae | 2010-04-07 | 1 | -7/+25 |
| | | | |_|/ | | | |/| | | |||||
* | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-04-12 | 1 | -2/+4 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-04-12 | 1 | -2/+4 |
| |\ \ \ \ | |||||
| | * | | | | Fix crash with QTextEdit::textChanged() when deleting a character | Eskil Abrahamsen Blomfeldt | 2010-04-12 | 1 | -2/+4 |
| * | | | | | Clear QFontCache TLS content before nullifying TLS pointer. | Janne Koskinen | 2010-04-08 | 1 | -1/+3 |
| |/ / / / | |||||
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-04-10 | 1 | -1/+3 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7 | Janne Koskinen | 2010-04-08 | 10 | -108/+229 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Clear QFontCache TLS content before nullifying TLS pointer. | Janne Koskinen | 2010-04-08 | 1 | -1/+3 |
| * | | | | Merge remote branch 'qt/4.7' into 4.7 | Shane Kearns | 2010-03-30 | 9 | -24/+71 |
| |\ \ \ \ | |||||
| * | | | | | Adding QFontDatabase::removeAllApplicationFonts() | Alessandro Portale | 2010-03-29 | 1 | -0/+5 |
* | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-04-09 | 3 | -1/+33 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-04-06 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Fix crash for multiscript text in QTextEngine::boundingBox() | Eskil Abrahamsen Blomfeldt | 2010-04-06 | 1 | -1/+1 |
| * | | | | | Implementing QFontEngineS60::getSfntTableData() | Alessandro Portale | 2010-04-05 | 2 | -0/+32 |
| |/ / / / | |||||
* | | | | | Merge remote branch 'origin/4.7' into 4.7 | Olivier Goffart | 2010-04-01 | 2 | -2/+6 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-31 | 2 | -3/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | Remove the "Insert unicode control character" menu entry on X11. | Pierre Rossi | 2010-03-31 | 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 | 2010-03-30 | 1 | -1/+4 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-03-30 | 1 | -1/+4 |
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| | | | * | | | | Fix compile error with QT_NO_TEXTHTMLPARSER in QtGui | Tasuku Suzuki | 2010-03-26 | 1 | -1/+4 |
| * | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-31 | 2 | -0/+4 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-03-30 | 2 | -0/+10 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-03-30 | 34 | -164/+1386 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Support the pen set on the painter in QStaticText when using rich text | Eskil Abrahamsen Blomfeldt | 2010-03-30 | 1 | -0/+5 |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-03-30 | 7 | -106/+209 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-03-29 | 1 | -24/+24 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Round instead of ceil font metrics when ForceIntegerMetrics is enabled | Tor Arne Vestbø | 2010-03-26 | 1 | -24/+24 |
| | * | | | | | Make QStaticText layout lazy | Eskil Abrahamsen Blomfeldt | 2010-03-29 | 3 | -28/+44 |
| | * | | | | | Change QStaticText::setMaximumSize() to setTextWidth() | Eskil Abrahamsen Blomfeldt | 2010-03-29 | 3 | -44/+55 |
| | * | | | | | Respect QPainter::pen() in QPainter::drawStaticText() | Eskil Abrahamsen Blomfeldt | 2010-03-29 | 1 | -3/+12 |
| | |/ / / / | |||||
| | * | | | | Synchronize rich text and plain text code paths in QStaticText | Eskil Abrahamsen Blomfeldt | 2010-03-26 | 1 | -2/+4 |
| | * | | | | Merge remote branch 'origin/4.7' into 4.7 | Olivier Goffart | 2010-03-25 | 3 | -10/+9 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-03-25 | 1 | -2/+2 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix QFontMetrics::height() and QFontMetrics autotest | Eskil Abrahamsen Blomfeldt | 2010-03-25 | 1 | -2/+2 |
| | * | | | | | Fix glyph advance on Mac/Carbon | Eskil Abrahamsen Blomfeldt | 2010-03-25 | 1 | -10/+43 |
| | |/ / / / | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-03-24 | 1 | -3/+2 |
| | |\ \ \ \ |