summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-207-5/+901
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-192-1/+26
| |\
| | * Add convenience function QTextCursor::positionInBlock()mae2010-02-192-1/+26
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-191-6/+13
| |\ \
| | * \ Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-181-6/+13
| | |\ \ | | | |/
| * | | Fix fallback for QStaticText when it's unsupported in paint engineEskil Abrahamsen Blomfeldt2010-02-192-7/+10
| |/ /
| * | Fix warnings on gccEskil Abrahamsen Blomfeldt2010-02-181-3/+3
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Jason McDonald2010-02-162-34/+50
| |\ \
| | * | Rename QStaticText::setUseBackendOptimizations to setPerformanceHint()Eskil Abrahamsen Blomfeldt2010-02-162-22/+34
| | * | doc: Update documentation for QStaticTextEskil Abrahamsen Blomfeldt2010-02-161-12/+16
| * | | Fix license headers.Jason McDonald2010-02-163-54/+54
| |/ /
| * | 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-155-9/+16
| |\ \
| * | | 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
generated by cgit v0.12 at 2025-01-07 16:22:14 (GMT)