summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-101-1/+5
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Blinking cursors are 2 pixels wide on Mac OS X/Cocoa.Prasanth Ullattil2010-02-101-1/+5
| | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-101-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Make compileThomas Zander2010-02-101-1/+1
| | | |/ / / / / / / /
| | * | | | | | | | | Clarify QFont::rawName() docs.Trond Kjernåsen2010-02-101-2/+3
| | |/ / / / / / / /
* | | | | | | | | | 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-154-2/+853
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'qstatictext-4.7' of git@scm.dev.nokia.troll.no:qt/qt-graphics-t...Eskil Abrahamsen Blomfeldt2010-02-158-28/+76
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7Eskil Abrahamsen Blomfeldt2010-02-158-28/+76
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| * | | | | | | | | | | Separate out textFormat property from setText() function and removeEskil Abrahamsen Blomfeldt2010-02-153-24/+40
| |/ / / / / / / / / /
| * | | | | | | | | | Add API for rich text and getting actual size of QStaticTextEskil Abrahamsen Blomfeldt2010-02-143-26/+68
| * | | | | | | | | | Make QStaticText public API againEskil Abrahamsen Blomfeldt2010-02-105-183/+172
| * | | | | | | | | | Merge branch '4.6' into qstatictext-4.6Eskil Abrahamsen Blomfeldt2010-02-101-6/+5
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch '4.6' into qstatictext-4.6Eskil Abrahamsen Blomfeldt2010-02-083-5/+8
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Temporarily remove QPainter::drawStaticText() for Qt 4.6.x integrationEskil Abrahamsen Blomfeldt2010-02-053-39/+46
| * | | | | | | | | | | Revert changes made to QTextEngine for QStaticTextEskil Abrahamsen Blomfeldt2010-02-042-68/+1
| * | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into qstat...Eskil Abrahamsen Blomfeldt2010-02-042-21/+60
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' into qstatictext-4.6Eskil Abrahamsen Blomfeldt2010-02-013-4/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Add private header warning to qstatictext_p.hEskil Abrahamsen Blomfeldt2010-02-011-0/+11
| * | | | | | | | | | | | Make QStaticText private APIEskil Abrahamsen Blomfeldt2010-02-015-182/+183
| * | | | | | | | | | | | Don't compare bool to char (avoid warning on MSVC)Eskil Abrahamsen Blomfeldt2010-02-011-1/+2
| * | | | | | | | | | | | doc: Add \since to QStaticTextEskil Abrahamsen Blomfeldt2010-02-011-0/+1
| * | | | | | | | | | | | Improve performance of QStaticText on OpenGL by caching data on GPUEskil Abrahamsen Blomfeldt2010-01-293-15/+90
| * | | | | | | | | | | | Remove unused constructor in QStaticTextPrivateEskil Abrahamsen Blomfeldt2010-01-292-11/+0
| * | | | | | | | | | | | Initialize member variables in QStaticTextPrivate constructorEskil Abrahamsen Blomfeldt2010-01-291-0/+1
| * | | | | | | | | | | | Compile for SymbianEskil Abrahamsen Blomfeldt2010-01-261-0/+1
| * | | | | | | | | | | | CompileEskil Abrahamsen Blomfeldt2010-01-201-1/+1
| * | | | | | | | | | | | Add font object to QStaticTextEskil Abrahamsen Blomfeldt2010-01-202-1/+3
| * | | | | | | | | | | | Implement QPaintBufferEngine::drawStaticTextItem()Eskil Abrahamsen Blomfeldt2010-01-181-0/+2
| * | | | | | | | | | | | doc: Add some performance hints to the documentationEskil Abrahamsen Blomfeldt2010-01-151-4/+11
| * | | | | | | | | | | | Fix crash when wrapping textEskil Abrahamsen Blomfeldt2010-01-151-1/+1
| * | | | | | | | | | | | Update size commentEskil Abrahamsen Blomfeldt2010-01-151-1/+2
| * | | | | | | | | | | | Update size comment in QStaticTextPrivateEskil Abrahamsen Blomfeldt2010-01-141-1/+1
| * | | | | | | | | | | | Optimize drawStaticText() with rectangle destinationEskil Abrahamsen Blomfeldt2010-01-142-5/+13
| * | | | | | | | | | | | Add prepare() function to QStaticTextEskil Abrahamsen Blomfeldt2010-01-142-1/+29
| * | | | | | | | | | | | Implement drawStaticTextItem() in OpenGL paint enginesEskil Abrahamsen Blomfeldt2010-01-142-2/+5
| * | | | | | | | | | | | Remove font property in QStaticText and fix handling translation onEskil Abrahamsen Blomfeldt2010-01-142-35/+5
| * | | | | | | | | | | | Speed up QStaticText initializationEskil Abrahamsen Blomfeldt2010-01-141-10/+5
| * | | | | | | | | | | | Allow access to QStaticTextPrivate from autotestsEskil Abrahamsen Blomfeldt2010-01-141-4/+3
| * | | | | | | | | | | | Some documentation fixesEskil Abrahamsen Blomfeldt2010-01-141-4/+7
| * | | | | | | | | | | | Support transformations in drawStaticText() and optimize for spaceEskil Abrahamsen Blomfeldt2010-01-142-26/+78
| * | | | | | | | | | | | Optimize QStaticText for spaceEskil Abrahamsen Blomfeldt2010-01-142-78/+53
| * | | | | | | | | | | | Remove const-specifier to make QTextItemInt::operator=() more beautifulEskil Abrahamsen Blomfeldt2010-01-142-2/+2
| * | | | | | | | | | | | Respect font settings of QStaticText and clip to maximum sizeEskil Abrahamsen Blomfeldt2010-01-141-0/+2
| * | | | | | | | | | | | Support maximumSize for the layout of the text in a QStaticTextEskil Abrahamsen Blomfeldt2010-01-145-54/+278
| * | | | | | | | | | | | Speed optimization for QStaticTextEskil Abrahamsen Blomfeldt2010-01-145-18/+31
| * | | | | | | | | | | | Fix drawing in QStaticTextEskil Abrahamsen Blomfeldt2010-01-141-0/+1
| * | | | | | | | | | | | Space optimization in QStaticTextEskil Abrahamsen Blomfeldt2010-01-141-8/+7
| * | | | | | | | | | | | Optimize QStaticText for one line stringsEskil Abrahamsen Blomfeldt2010-01-145-65/+89
| * | | | | | | | | | | | Fix memory leakEskil Abrahamsen Blomfeldt2010-01-141-1/+3