summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-07-195-29/+27
|\
| * Preserve the scale of fonts when caching the font engineMichael Sheldon2016-07-192-20/+20
| * Optimize string usageAnton Kudryavtsev2016-07-152-4/+2
| * Use QStringLiteral more judiciouslyAnton Kudryavtsev2016-07-081-1/+1
| * Replace QString::trimmed() with QStringRef::trimmed()Anton Kudryavtsev2016-07-061-4/+4
* | Improve performance of Qt::mightBeRichText by using QStringRefRobin Burchell2016-07-111-3/+3
* | Add qtguiglobal.h and qtguiglobal_p.hLars Knoll2016-07-0345-10/+45
* | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-211-17/+5
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-202-6/+5
| |\
| | * Remove unused macro: QT_DISTANCEFIELD_DEFAULT_TILESIZEEskil Abrahamsen Blomfeldt2016-06-151-4/+0
| | * Fix crash when creating distance field for large glyphEskil Abrahamsen Blomfeldt2016-06-141-1/+3
| | * Make it possible to create distance fields with any heightEskil Abrahamsen Blomfeldt2016-06-141-1/+2
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-172-2/+2
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-162-2/+2
| |\ \
| | * | Use void instead of uchar in the endian-swapping function parametersv5.7.0-rc1Thiago Macieira2016-05-262-2/+2
* | | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-1315-85/+79
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-101-1/+0
| |\ \ \ | | | |/ | | |/|
| | * | Fix font-weight regressionAllan Sandfeld Jensen2016-06-041-1/+0
| * | | Replace qAllocMore with a pair of more useful functionsThiago Macieira2016-06-091-6/+3
| * | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-065-10/+15
| |\ \ \ | | |/ /
| | * | Don't alter input string in QTextLayout with ShowLineAndParagraphSeparatorsEskil Abrahamsen Blomfeldt2016-06-011-1/+7
| | * | Fix bugs causing Thin font weights to be ignored or mishandled.Jake Petroules2016-06-014-9/+8
| * | | QTextDocument: use QString::replace() for replacingAnton Kudryavtsev2016-06-021-7/+2
| * | | QTextDocument: use QL1S::size() to get size of internal stringAnton Kudryavtsev2016-06-021-3/+3
| * | | QtGui: use QStringRef to optimize memory allocationAnton Kudryavtsev2016-06-023-9/+8
| * | | QFontDatabase: append substitutes directly to the family listAnton Kudryavtsev2016-06-021-7/+2
| * | | Gui: use const (and const APIs) moreAnton Kudryavtsev2016-06-019-43/+47
| | |/ | |/|
* | | Remove all code paths related to unsupported Apple platforms.Jake Petroules2016-06-041-3/+1
* | | Add line feed and carriage return to blacklisted charactersEskil Abrahamsen Blomfeldt2016-05-241-2/+10
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-231-3/+0
|\ \ \ | |/ /
| * | QFont::exactMatch() should return false for aliasesEskil Abrahamsen Blomfeldt2016-05-121-3/+0
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-1213-81/+271
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-061-2/+5
| |\ \ | | |/
| | * doc: Clarify how to remove a QTextFrameEskil Abrahamsen Blomfeldt2016-05-041-2/+5
| * | Support color font rendering for freetype engineJian Liang2016-05-032-48/+193
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-291-5/+4
| |\ \ | | |/
| | * QZipReader - test that QFile::open was, indeed, successful.Timur Pocheptsov2016-04-261-4/+2
| * | Change some members of QFontEngineFT::Glyph to shortJian Liang2016-04-292-7/+4
| * | Fix font fallback for an overridden Common script casesKonstantin Ritt2016-04-273-2/+17
| * | QtGui: mark more types as primitive/movableMarc Mutz2016-04-251-0/+1
| * | Interpret fixed CSS line-height as minimum rather than absoluteEskil Abrahamsen Blomfeldt2016-04-195-17/+47
* | | QtGui: Introduce delegating constructors.Friedemann Kleint2016-05-091-4/+1
* | | Add some QChar::unicode() calls to brush over deprecation warning.Friedemann Kleint2016-05-061-2/+2
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-031-10/+9
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-131-10/+9
| |\ \ | | |/
| | * Qt Quick: Fix bug for selections with line wraps and breaksEskil Abrahamsen Blomfeldt2016-04-081-10/+9
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-114-10/+15
|\ \ \ | |/ /
| * | QtBase: use erase and std::remove_if with QList and QVectorAnton Kudryavtsev2016-04-081-8/+6
| * | Add flag for showing document terminator in textEskil Abrahamsen Blomfeldt2016-04-083-2/+9
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-056-10/+31
|\ \ \ | |/ /