summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-134-5/+5
|\
| * Doc: Change instances of '(Mac) OS X' to 'macOS'Topi Reinio2016-08-124-5/+5
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-101-0/+1
|\ \ | |/
| * Added pointer check in QFontDatabase::loadJesus Fernandez2016-08-051-0/+1
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Liang Qi2016-08-051-1/+5
|\ \
| * \ Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-051-1/+5
| |\ \ | | |/
| | * REG: Fix unwanted cache flush in Freetype engineEskil Abrahamsen Blomfeldt2016-08-011-1/+5
* | | Re-add the space character as a document terminatorAndy Shaw2016-08-051-4/+5
|/ /
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-011-1/+4
|\ \ | |/
| * Fontengine: Avoid invalid alpha maps when antialiasing is offEirik Aavitsland2016-07-271-1/+4
* | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-261-3/+5
|\ \ | |/
| * Fix performance regression when changing fontsEskil Abrahamsen Blomfeldt2016-07-221-3/+5
* | 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
* | 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.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.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
| |/ |/|
* | QFont::exactMatch() should return false for aliasesEskil Abrahamsen Blomfeldt2016-05-121-3/+0
* | 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
* | 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
* | 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.6' into 5.7Liang Qi2016-04-045-2/+23
|\ \ | |/
| * Fix possible out-of-bounds access when making distance fieldsEskil Abrahamsen Blomfeldt2016-03-311-1/+3
| * QFontEngineFT: Apply hinting for non-scaled rotated glyphsAlexander Volkov2016-03-301-1/+7