summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-2041-105/+1711
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-194-1/+48
| |\
| | * Add convenience function QTextCursor::positionInBlock()mae2010-02-192-1/+26
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-182-0/+22
| | |\
| | | * Added QPlainTextEditor::anchorAt(const QPoint &pos)Thorbjørn Lindeijer2010-02-172-0/+22
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-192-3/+7
| |\ \ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-1819-145/+361
| | |\ \ \ | | | |/ /
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-172-3/+7
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-161-1/+5
| | | * | Fixing QDesktopServices so that file server session can be accessedAleksandar Sasha Babic2010-02-151-2/+2
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-1919-145/+361
| |\ \ \ \
| | * \ \ \ Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-1819-145/+361
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| * | | | | Fix fallback for QStaticText when it's unsupported in paint engineEskil Abrahamsen Blomfeldt2010-02-193-8/+11
| |/ / / /
| * | | | Fix warnings on gccEskil Abrahamsen Blomfeldt2010-02-182-5/+6
| * | | | Fixed old trace files no longer working.Samuel Rødal2010-02-181-1/+3
| * | | | Reduced the memory footprint of qttrace files.Samuel Rødal2010-02-182-8/+107
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-1712-94/+107
| |\ \ \ \
| | * | | | Fixes crash when destroying a QGraphicsItem.Yoann Lopes2010-02-171-2/+3
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-1734-83/+1522
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Fixed compile on Mac.Kim Motoyoshi Kalland2010-02-161-1/+1
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Jason McDonald2010-02-163-34/+73
| | | |\ \ \
| | | * | | | Fix license headers.Jason McDonald2010-02-163-54/+54
| * | | | | | Make sure height of glyph cache is a power of twoEskil Abrahamsen Blomfeldt2010-02-171-8/+18
| | |_|/ / / | |/| | | |
| * | | | | Rename QStaticText::setUseBackendOptimizations to setPerformanceHint()Eskil Abrahamsen Blomfeldt2010-02-162-22/+34
| * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-161-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fixed a compile error on Mac/Leopard.Trond Kjernåsen2010-02-161-1/+1
| * | | | | doc: Update documentation for QStaticTextEskil Abrahamsen Blomfeldt2010-02-162-12/+39
| |/ / / /
| * | | | Compile fix for QStaticText - include declaration of QColorRhys Weatherley2010-02-151-0/+1
| * | | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-1526-123/+196
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Support Qt::AutoTest in QStaticText::setTextFormat()Eskil Abrahamsen Blomfeldt2010-02-151-3/+3
| * | | | Merge branch 'qt-graphics-team-qstatictext-4.7'Eskil Abrahamsen Blomfeldt2010-02-1532-115/+1228
| |\ \ \ \
| | * \ \ \ Merge branch 'qstatictext-4.7' of git@scm.dev.nokia.troll.no:qt/qt-graphics-t...Eskil Abrahamsen Blomfeldt2010-02-15121-1160/+2498
| | |\ \ \ \
| | | * \ \ \ Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7Eskil Abrahamsen Blomfeldt2010-02-15121-1160/+2498
| | | |\ \ \ \
| | * | | | | | Separate out textFormat property from setText() function and removeEskil Abrahamsen Blomfeldt2010-02-154-25/+41
| | |/ / / / /
| | * | | | | Add API for rich text and getting actual size of QStaticTextEskil Abrahamsen Blomfeldt2010-02-144-31/+78
| | * | | | | Make QStaticText public API againEskil Abrahamsen Blomfeldt2010-02-1010-234/+233
| | * | | | | Merge branch '4.6' into qstatictext-4.6Eskil Abrahamsen Blomfeldt2010-02-1027-231/+301
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.6' into qstatictext-4.6Eskil Abrahamsen Blomfeldt2010-02-0821-87/+226
| | |\ \ \ \ \ \
| | * | | | | | | Remove redundant friend declaration for QPainterPrivate in QPainterEskil Abrahamsen Blomfeldt2010-02-051-1/+0
| | * | | | | | | Temporarily remove QPainter::drawStaticText() for Qt 4.6.x integrationEskil Abrahamsen Blomfeldt2010-02-057-105/+91
| | * | | | | | | Use state in QPaintBuffer rather than search for the transform cmdEskil Abrahamsen Blomfeldt2010-02-051-10/+1
| | * | | | | | | Revert changes made to QTextEngine for QStaticTextEskil Abrahamsen Blomfeldt2010-02-042-68/+1
| | * | | | | | | Clean up diff for QStaticTextEskil Abrahamsen Blomfeldt2010-02-042-3/+2
| | * | | | | | | Remove unused codeEskil Abrahamsen Blomfeldt2010-02-041-7/+0
| | * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into qstat...Eskil Abrahamsen Blomfeldt2010-02-0433-273/+872
| | |\ \ \ \ \ \ \
| | * | | | | | | | Lock before calling drawStaticTextItemAnders Bakken2010-02-021-1/+1
| | * | | | | | | | Make QRasterPaintEngine::drawStaticText public.Anders Bakken2010-02-021-2/+2
| | * | | | | | | | Merge branch '4.6' into qstatictext-4.6Eskil Abrahamsen Blomfeldt2010-02-0167-613/+1858
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Clarify comment in QPainterEskil Abrahamsen Blomfeldt2010-02-011-1/+1
| | * | | | | | | | | Add private header warning to qstatictext_p.hEskil Abrahamsen Blomfeldt2010-02-011-0/+11
generated by cgit v0.12 at 2024-11-11 21:14:49 (GMT)