Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | * | | | Merge remote branch 'qt/master' into staging-2-master | Qt Continuous Integration System | 2010-02-18 | 1 | -6/+13 | |
| | | | |\ \ \ | | | | | |/ / | ||||||
| | | * | | | | Fix fallback for QStaticText when it's unsupported in paint engine | Eskil Abrahamsen Blomfeldt | 2010-02-19 | 2 | -7/+10 | |
| | | |/ / / | ||||||
| | | * | | | Fix warnings on gcc | Eskil Abrahamsen Blomfeldt | 2010-02-18 | 1 | -3/+3 | |
| | * | | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-18 | 1 | -6/+13 | |
| | |\ \ \ \ | | | | |/ / | | | |/| | | ||||||
| | | * | | | doc: Fixed some qdoc errors. | Martin Smith | 2010-02-16 | 1 | -6/+13 | |
| | * | | | | Merge branch '4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-17 | 1 | -2/+12 | |
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/| | ||||||
| | | * | | Fix Thai text on Windows 7 | Eskil Abrahamsen Blomfeldt | 2010-02-16 | 1 | -2/+12 | |
| * | | | | Copy useBackendOptimization setting when QStaticText is detached | Eskil Abrahamsen Blomfeldt | 2010-02-22 | 1 | -1/+1 | |
| | |_|/ | |/| | | ||||||
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 | Jason McDonald | 2010-02-16 | 2 | -34/+50 | |
| |\ \ \ | ||||||
| | * | | | Rename QStaticText::setUseBackendOptimizations to setPerformanceHint() | Eskil Abrahamsen Blomfeldt | 2010-02-16 | 2 | -22/+34 | |
| | * | | | doc: Update documentation for QStaticText | Eskil Abrahamsen Blomfeldt | 2010-02-16 | 1 | -12/+16 | |
| * | | | | Fix license headers. | Jason McDonald | 2010-02-16 | 3 | -54/+54 | |
| |/ / / | ||||||
| * | | | Compile fix for QStaticText - include declaration of QColor | Rhys Weatherley | 2010-02-15 | 1 | -0/+1 | |
| * | | | Merge remote branch 'qt/master' into staging-2-master | Qt Continuous Integration System | 2010-02-15 | 5 | -9/+16 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 6 | -30/+76 | |
| | |\ \ | ||||||
| | | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-12 | 2 | -5/+7 | |
| | | |\ \ | ||||||
| | | | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-11 | 2 | -5/+7 | |
| | | | |\ \ | ||||||
| | | | | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-10 | 2 | -5/+7 | |
| | | | | |\ \ | ||||||
| | | | | | * | | A little optimization in QTextControlPrivate::setContent. | Alexis Menard | 2010-02-09 | 1 | -3/+5 | |
| | | | | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-05 | 1 | -2/+2 | |
| | | | | | |\ \ | ||||||
| | | | | | | * \ | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso... | Warwick Allison | 2010-02-04 | 1 | -2/+2 | |
| | | | | | | |\ \ | ||||||
| | | | | | | | * \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-02-02 | 2 | -3/+5 | |
| | | | | | | | |\ \ | ||||||
| | | | | | | | * | | | Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacing | Warwick Allison | 2010-01-14 | 1 | -1/+9 | |
| | | | | | | | * | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-01-14 | 93 | -156/+140 | |
| | | | | | | | |\ \ \ | ||||||
| | | | | | | | * | | | | Compile fix for QMLViewer | Thomas Hartmann | 2010-01-08 | 1 | -2/+2 | |
| | * | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-12 | 3 | -4/+9 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | / | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | ||||||
| | | * | | | | | | | | 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 | |