Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-02-10 | 1 | -1/+5 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | Blinking cursors are 2 pixels wide on Mac OS X/Cocoa. | Prasanth Ullattil | 2010-02-10 | 1 | -1/+5 | |
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-02-10 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | Make compile | Thomas Zander | 2010-02-10 | 1 | -1/+1 | |
| | | |/ / / / / / / / | ||||||
| | * | | | | | | | | | Clarify QFont::rawName() docs. | Trond Kjernåsen | 2010-02-10 | 1 | -2/+3 | |
| | |/ / / / / / / / | ||||||
* | | | | | | | | | | Support Qt::AutoTest in QStaticText::setTextFormat() | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 1 | -3/+3 | |
* | | | | | | | | | | Merge branch 'qt-graphics-team-qstatictext-4.7' | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 4 | -2/+853 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'qstatictext-4.7' of git@scm.dev.nokia.troll.no:qt/qt-graphics-t... | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 8 | -28/+76 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7 | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 8 | -28/+76 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | | Separate out textFormat property from setText() function and remove | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 3 | -24/+40 | |
| |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Add API for rich text and getting actual size of QStaticText | Eskil Abrahamsen Blomfeldt | 2010-02-14 | 3 | -26/+68 | |
| * | | | | | | | | | | Make QStaticText public API again | Eskil Abrahamsen Blomfeldt | 2010-02-10 | 5 | -183/+172 | |
| * | | | | | | | | | | Merge branch '4.6' into qstatictext-4.6 | Eskil Abrahamsen Blomfeldt | 2010-02-10 | 1 | -6/+5 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch '4.6' into qstatictext-4.6 | Eskil Abrahamsen Blomfeldt | 2010-02-08 | 3 | -5/+8 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Temporarily remove QPainter::drawStaticText() for Qt 4.6.x integration | Eskil Abrahamsen Blomfeldt | 2010-02-05 | 3 | -39/+46 | |
| * | | | | | | | | | | | Revert changes made to QTextEngine for QStaticText | Eskil Abrahamsen Blomfeldt | 2010-02-04 | 2 | -68/+1 | |
| * | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into qstat... | Eskil Abrahamsen Blomfeldt | 2010-02-04 | 2 | -21/+60 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' into qstatictext-4.6 | Eskil Abrahamsen Blomfeldt | 2010-02-01 | 3 | -4/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add private header warning to qstatictext_p.h | Eskil Abrahamsen Blomfeldt | 2010-02-01 | 1 | -0/+11 | |
| * | | | | | | | | | | | | Make QStaticText private API | Eskil Abrahamsen Blomfeldt | 2010-02-01 | 5 | -182/+183 | |
| * | | | | | | | | | | | | Don't compare bool to char (avoid warning on MSVC) | Eskil Abrahamsen Blomfeldt | 2010-02-01 | 1 | -1/+2 | |
| * | | | | | | | | | | | | doc: Add \since to QStaticText | Eskil Abrahamsen Blomfeldt | 2010-02-01 | 1 | -0/+1 | |
| * | | | | | | | | | | | | Improve performance of QStaticText on OpenGL by caching data on GPU | Eskil Abrahamsen Blomfeldt | 2010-01-29 | 3 | -15/+90 | |
| * | | | | | | | | | | | | Remove unused constructor in QStaticTextPrivate | Eskil Abrahamsen Blomfeldt | 2010-01-29 | 2 | -11/+0 | |
| * | | | | | | | | | | | | Initialize member variables in QStaticTextPrivate constructor | Eskil Abrahamsen Blomfeldt | 2010-01-29 | 1 | -0/+1 | |
| * | | | | | | | | | | | | Compile for Symbian | Eskil Abrahamsen Blomfeldt | 2010-01-26 | 1 | -0/+1 | |
| * | | | | | | | | | | | | Compile | Eskil Abrahamsen Blomfeldt | 2010-01-20 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Add font object to QStaticText | Eskil Abrahamsen Blomfeldt | 2010-01-20 | 2 | -1/+3 | |
| * | | | | | | | | | | | | Implement QPaintBufferEngine::drawStaticTextItem() | Eskil Abrahamsen Blomfeldt | 2010-01-18 | 1 | -0/+2 | |
| * | | | | | | | | | | | | doc: Add some performance hints to the documentation | Eskil Abrahamsen Blomfeldt | 2010-01-15 | 1 | -4/+11 | |
| * | | | | | | | | | | | | Fix crash when wrapping text | Eskil Abrahamsen Blomfeldt | 2010-01-15 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Update size comment | Eskil Abrahamsen Blomfeldt | 2010-01-15 | 1 | -1/+2 | |
| * | | | | | | | | | | | | Update size comment in QStaticTextPrivate | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Optimize drawStaticText() with rectangle destination | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 2 | -5/+13 | |
| * | | | | | | | | | | | | Add prepare() function to QStaticText | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 2 | -1/+29 | |
| * | | | | | | | | | | | | Implement drawStaticTextItem() in OpenGL paint engines | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 2 | -2/+5 | |
| * | | | | | | | | | | | | Remove font property in QStaticText and fix handling translation on | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 2 | -35/+5 | |
| * | | | | | | | | | | | | Speed up QStaticText initialization | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -10/+5 | |
| * | | | | | | | | | | | | Allow access to QStaticTextPrivate from autotests | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -4/+3 | |
| * | | | | | | | | | | | | Some documentation fixes | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -4/+7 | |
| * | | | | | | | | | | | | Support transformations in drawStaticText() and optimize for space | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 2 | -26/+78 | |
| * | | | | | | | | | | | | Optimize QStaticText for space | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 2 | -78/+53 | |
| * | | | | | | | | | | | | Remove const-specifier to make QTextItemInt::operator=() more beautiful | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 2 | -2/+2 | |
| * | | | | | | | | | | | | Respect font settings of QStaticText and clip to maximum size | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -0/+2 | |
| * | | | | | | | | | | | | Support maximumSize for the layout of the text in a QStaticText | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 5 | -54/+278 | |
| * | | | | | | | | | | | | Speed optimization for QStaticText | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 5 | -18/+31 | |
| * | | | | | | | | | | | | Fix drawing in QStaticText | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -0/+1 | |
| * | | | | | | | | | | | | Space optimization in QStaticText | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -8/+7 | |
| * | | | | | | | | | | | | Optimize QStaticText for one line strings | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 5 | -65/+89 | |
| * | | | | | | | | | | | | Fix memory leak | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -1/+3 | |