| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Shane Kearns | 2009-11-10 | 1 | -2/+2 |
|\ |
|
| * | Merge branch '4.6-api-review' into 4.6 | Marius Storm-Olsen | 2009-11-09 | 1 | -2/+2 |
| |\ |
|
| | * | API review: Rename functions numColors(), setNumColors() and numBytes() | Marius Storm-Olsen | 2009-11-06 | 1 | -2/+2 |
|
|
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60 | axis | 2009-11-09 | 6 | -63/+95 |
|\ \ \
| |/ / |
|
| * | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-06 | 6 | -62/+92 |
| |\ \ |
|
| | * \ | Merge commit 'origin/4.6' into 4.6 | Olivier Goffart | 2009-11-06 | 3 | -48/+71 |
| | |\ \
| | | |/ |
|
| | | * | Compile | Eskil Abrahamsen Blomfeldt | 2009-11-06 | 1 | -1/+1 |
|
|
| | | * | add support for the N'Ko writing system to Qt | Lars Knoll | 2009-11-06 | 3 | -47/+70 |
|
|
| | * | | Merge commit 'origin/4.6' into 4.6 | Olivier Goffart | 2009-11-05 | 1 | -1/+2 |
| | |\ \
| | | |/ |
|
| | * | | Fix textControl so that it ignores mouse press events when needed | Thierry Bastian | 2009-11-05 | 2 | -12/+16 |
|
|
| | * | | Merge commit 'origin/4.6' into 4.6 | Olivier Goffart | 2009-11-04 | 6 | -39/+71 |
| | |\ \ |
|
| | * | | | QCSSParser: Fixes the way spaces are handled in font family. | Olivier Goffart | 2009-11-02 | 1 | -2/+5 |
|
|
| * | | | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-04 | 3 | -40/+38 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| * | | | | QPlainTextEdit redraw issue in QTextControl | mae | 2009-11-04 | 1 | -1/+3 |
|
|
* | | | | | Using qreal more consistently in code (prevent misuse of double) | Aleksandar Sasha Babic | 2009-11-06 | 2 | -5/+7 |
| |/ / /
|/| | | |
|
* | | | | Merge branch '4.6-s60' into 4.6 | axis | 2009-11-04 | 1 | -1/+2 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Fixed an input method bug when erasing the last character. | axis | 2009-11-03 | 1 | -1/+2 |
|
|
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Gunnar Sletta | 2009-11-03 | 9 | -46/+78 |
|\ \ \ \
| |/ / / |
|
| * | | | fix font height calculation on QWS | Joerg Bornemann | 2009-11-03 | 1 | -1/+1 |
| |/ / |
|
| * | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-02 | 6 | -45/+44 |
| |\ \ |
|
| | * \ | Merge commit 'origin/4.6' into feature | Jørgen Lind | 2009-11-02 | 7 | -50/+47 |
| | |\ \
| | | |/ |
|
| | | * | Merge commit 'widget/4.6' into origin/4.6 | Olivier Goffart | 2009-10-30 | 5 | -45/+42 |
| | | |\ |
|
| | | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6 | Jan-Arve Sæther | 2009-10-28 | 1 | -8/+10 |
| | | | |\ |
|
| | | | | * | Qt::escape(): also escape the quote (") | Olivier Goffart | 2009-10-28 | 1 | -22/+5 |
|
|
| | | | | * | Fix XML entities in QTextDocument::toHtml() | Thorvald Natvig | 2009-10-28 | 1 | -7/+26 |
|
|
| | | | * | | Merge branch 'fixes' of git://gitorious.org/~fleury/qt/fleury-openbossa-clone... | Jan-Arve Sæther | 2009-10-28 | 15 | -45/+132 |
| | | | |\ \
| | | | | |/
| | | | |/| |
|
| | | | * | | Always use QExplicitlySharedDataPointer<QFontPrivate> | Andreas Kling | 2009-10-27 | 4 | -37/+32 |
|
|
| | * | | | | Fix LIBRARY and ICON | Jørgen Lind | 2009-10-29 | 1 | -0/+2 |
| | | |_|/
| | |/| | |
|
| * | | | | Merge commit 'mainline/4.6' into 4.6 | hjk | 2009-10-30 | 2 | -5/+5 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| * | | | | introduce int QTextDocument::available{Undo,Redo}Steps() const; | hjk | 2009-10-30 | 3 | -0/+33 |
| | |/ /
| |/| | |
|
* | | | | Avoid infinite loop when laying out text with unconvertible chars | Eskil Abrahamsen Blomfeldt | 2009-10-29 | 1 | -38/+35 |
| |/ /
|/| | |
|
* | | | Cocoa: Synthesize italic text correct way when adding glyphs to path | Eskil Abrahamsen Blomfeldt | 2009-10-26 | 1 | -1/+1 |
|
|
* | | | Fixed PDF generation for Windows. | Trond Kjernaasen | 2009-10-26 | 1 | -4/+4 |
|/ / |
|
* | | Make compile on X11 systems where qreal == float | Rhys Weatherley | 2009-10-26 | 1 | -1/+1 |
|
|
* | | Compile on QWS | Anders Bakken | 2009-10-23 | 1 | -1/+1 |
|
|
* | | Line spacing fixes | Joerg Bornemann | 2009-10-23 | 14 | -43/+130 |
|
|
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | Gunnar Sletta | 2009-10-23 | 1 | -75/+16 |
|\ \
| |/ |
|
| * | qfontengine_win.cpp: special Windows CE code removed | Joerg Bornemann | 2009-10-22 | 1 | -75/+16 |
|
|
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6 | Gunnar Sletta | 2009-10-22 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | Improved QFontInfo::pointSize() slightly on X11. | Kim Motoyoshi Kalland | 2009-10-21 | 1 | -1/+1 |
|
|
* | | Fix bug QTBUG-4848 | Sarah Smith | 2009-10-20 | 2 | -9/+14 |
|
|
* | | Fixed bad glyph rendering under cocoa | Gunnar Sletta | 2009-10-19 | 2 | -18/+47 |
|/ |
|
* | Second attempt: Fixed a few compiler warnings from QtGui for Symbian. | Janne Anttila | 2009-10-13 | 1 | -0/+1 |
|
|
* | Revert "Fixed a few compiler warnings from QtGui for Symbian." | Janne Anttila | 2009-10-13 | 1 | -1/+0 |
|
|
* | Fixed a few compiler warnings from QtGui for Symbian. | Janne Anttila | 2009-10-13 | 1 | -0/+1 |
|
|
* | Make QTextControl give the right default action to Drag manager | Shane Kearns | 2009-10-12 | 1 | -2/+6 |
|
|
* | Make writing out word-spacing use the right property. | Thomas Zander | 2009-10-12 | 1 | -2/+2 |
|
|
* | Fixed a bug visible in QPrintPreview with the X11 XLFD font engine. | Trond Kjernåsen | 2009-10-12 | 1 | -1/+1 |
|
|
* | Fix compile error on symbian platform | Shane Kearns | 2009-10-09 | 1 | -0/+4 |
|
|
* | Fix printing bitmap fonts on X11 with FontConfig enabled | Eskil Abrahamsen Blomfeldt | 2009-10-09 | 3 | -11/+24 |
|
|