summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Avoid always detaching QStaticTextEskil Abrahamsen Blomfeldt2010-02-241-2/+0
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-231-2/+2
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-233-7/+11
| |\
| * | Fix compilation with namespace.ck2010-02-221-2/+2
* | | Add private qt_draw_glyphs() APIEskil Abrahamsen Blomfeldt2010-02-231-0/+1
| |/ |/|
* | Imporve win64 support for mingwThierry Bastian2010-02-221-3/+3
* | Fix assert in fontengine when using rotated/scaled QStaticTextGunnar Sletta2010-02-221-3/+7
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-226-19/+64
|\ \ | |/
| * 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 remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-181-6/+13
| |\ \ \ | | | |/ | | |/|
| | * | doc: Fixed some qdoc errors.Martin Smith2010-02-161-6/+13
| * | | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-171-2/+12
| |\ \ \ | | |/ / | |/| |
| | * | Fix Thai text on Windows 7Eskil Abrahamsen Blomfeldt2010-02-161-2/+12
* | | | Copy useBackendOptimization setting when QStaticText is detachedEskil Abrahamsen Blomfeldt2010-02-221-1/+1
| |_|/ |/| |
* | | 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
|\ \ \ | |/ /
| * | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-136-30/+76
| |\ \
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-122-5/+7
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-112-5/+7
| | | |\ \
| | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-102-5/+7
| | | | |\ \
| | | | | * | A little optimization in QTextControlPrivate::setContent.Alexis Menard2010-02-091-3/+5
| | | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-051-2/+2
| | | | | |\ \
| | | | | | * \ Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-041-2/+2
| | | | | | |\ \
| | | | | | | * \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-02-022-3/+5
| | | | | | | |\ \
| | | | | | | * | | Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacingWarwick Allison2010-01-141-1/+9
| | | | | | | * | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-01-1493-156/+140
| | | | | | | |\ \ \
| | | | | | | * | | | Compile fix for QMLViewerThomas Hartmann2010-01-081-2/+2
| * | | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-123-4/+9
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | 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
generated by cgit v0.12 at 2024-11-28 22:49:56 (GMT)