Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 4.7 into qt-4.8-from-4.7 | Sergio Ahumada | 2011-12-30 | 1 | -1/+1 |
|\ | |||||
| * | Fix crash in positionInLigature | Jiang Jiang | 2011-12-16 | 1 | -1/+1 |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-11-14 | 3 | -25/+34 |
|\ \ | |||||
| * | | Fix regression in styleName searching | Jiang Jiang | 2011-11-09 | 2 | -24/+10 |
| * | | Fix styleName listing with the same QtFontStyle::Key value | Jiang Jiang | 2011-11-08 | 1 | -14/+17 |
| * | | Fix localized font family access in OS X | Jiang Jiang | 2011-11-08 | 2 | -4/+24 |
* | | | Fix QPlainTextEdit when using Qt::TextSelectableByKeyboard flag | jahonkon | 2011-11-11 | 1 | -5/+2 |
|/ / | |||||
* | | Fix QFont related compilation errors on Mac OSX Carbon | Samuli Piippo | 2011-11-01 | 2 | -3/+3 |
* | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-10-17 | 3 | -5/+5 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'qt/4.8' | Sami Lempinen | 2011-10-14 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | Converting from double to qreal in gui | mread | 2011-10-10 | 3 | -5/+5 |
* | | | | fix possible race conditions | Konstantin Ritt | 2011-10-07 | 1 | -1/+4 |
* | | | | QTBUG-21058: Fix for possible crashes in QTextControl::setCursorWidth() | Mikko Knuutila | 2011-10-04 | 1 | -4/+4 |
| |/ / |/| | | |||||
* | | | Fix possible crash in QFontEngineFT | Eskil Abrahamsen Blomfeldt | 2011-09-26 | 1 | -1/+1 |
|/ / | |||||
* | | Merge remote-tracking branch 'qt-mainline/4.8' | aavit | 2011-09-22 | 1 | -6/+9 |
|\ \ | |||||
| * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-09-20 | 1 | -6/+9 |
| |\ \ | |||||
| | * | | Resolve a number of compilation issues with INTEGRITY | Rolland Dudemaine | 2011-09-19 | 1 | -6/+9 |
* | | | | Only limit cursor position when line is wrapped | Jiang Jiang | 2011-09-21 | 1 | -1/+1 |
* | | | | Make sure cursor position doesn't exceed line end | Jiang Jiang | 2011-09-19 | 1 | -0/+3 |
|/ / / | |||||
* | | | Merge remote branch 'qt-mainline/4.8' | aavit | 2011-09-17 | 14 | -93/+54 |
|\ \ \ | |||||
| * \ \ | Merge remote branch 'origin/4.8' into 4.8-from-4.7 | Rohan McGovern | 2011-09-14 | 82 | -2332/+9603 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-09-10 | 11 | -177/+135 |
| | |\ | |||||
| | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-09-09 | 1 | -5/+2 |
| | |\ \ | |||||
| | | * | | Fix double click and drag not extending word selection. | Andrew den Exter | 2011-09-08 | 1 | -5/+2 |
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-09-08 | 13 | -88/+52 |
| | |\ \ \ | |||||
| | | * | | | Replace explicit surrogate handlers by inline methods of QChar class | suzuki toshiya | 2011-09-07 | 13 | -88/+52 |
| * | | | | | Release font engine refcount when done using it in QTextEngine | Jiang Jiang | 2011-09-09 | 3 | -5/+12 |
* | | | | | | Release font engine refcount when done using it in QTextEngine | Jiang Jiang | 2011-09-16 | 3 | -5/+12 |
* | | | | | | Do not put cursor at non-stop character positions | Jiang Jiang | 2011-09-14 | 1 | -0/+3 |
* | | | | | | doc: Fix incorrect enum name in QRawFont::alphaMapForGlyph docs | Eskil Abrahamsen Blomfeldt | 2011-09-13 | 1 | -1/+2 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT | Aleksandar Stojiljkovic | 2011-09-09 | 1 | -2/+6 |
* | | | | | Reset trailingSpaces in relayout | Jiang Jiang | 2011-09-09 | 1 | -0/+1 |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team | aavit | 2011-09-08 | 3 | -5/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Fix trailing spaces problem by not adding it to QScriptLine.length | Jiang Jiang | 2011-09-08 | 3 | -5/+6 |
* | | | | | | Merge remote-tracking branch 'qt-mainline/4.8' | aavit | 2011-09-08 | 4 | -12/+31 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-09-07 | 1 | -0/+8 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Fix the build with -qtnamespace configure options | suzuki toshiya | 2011-09-06 | 1 | -0/+8 |
| * | | | | Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7 | Sergio Ahumada | 2011-08-31 | 13 | -43/+94 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge remote-tracking branch 'upstream/4.8' | Sergio Ahumada | 2011-08-29 | 7 | -44/+56 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'mainline/4.8' | Oswald Buddenhagen | 2011-08-26 | 7 | -12/+42 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'mainline/4.8' | Oswald Buddenhagen | 2011-08-18 | 4 | -20/+33 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-08-16 | 1 | -17/+25 |
| | | |\ \ \ \ \ | |||||
| | * | | | | | | | Add support for rawFonts loaded from data in FaceId | Pierre Rossi | 2011-08-15 | 2 | -1/+4 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Sergio Ahumada | 2011-08-31 | 1 | -11/+19 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | Make text rendering working outside the gui thread on Symbian. | Laszlo Agocs | 2011-08-30 | 1 | -11/+19 |
* | | | | | | | | Fix RTL layout for fonts when non-printable character has an advance | John Tapsell | 2011-09-08 | 2 | -2/+4 |
* | | | | | | | | Fix regression in tst_qrawfont | Eskil Abrahamsen Blomfeldt | 2011-09-08 | 1 | -1/+3 |
* | | | | | | | | Make it compile on mac | aavit | 2011-09-07 | 1 | -3/+3 |
* | | | | | | | | micro optimizations | Konstantin Ritt | 2011-09-02 | 4 | -109/+48 |
* | | | | | | | | fix "comparison between signed and unsigned" warnings | Konstantin Ritt | 2011-09-02 | 1 | -7/+5 |