summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-03-241-8/+8
|\
| * QRawFont: fix UB in supportedWritingSystems()Marc Mutz2016-03-231-8/+8
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-212-4/+3
|\ \ | |/
| * Correct qt_defaultDpi X/Y with just a QCoreApplicationAllan Sandfeld Jensen2016-03-161-2/+2
| * QRawFont: fix UB (misaligned load) in fontTable()Marc Mutz2016-03-151-2/+1
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Liang Qi2016-03-132-3/+2
|\ \
| * \ Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-112-3/+2
| |\ \ | | |/
| | * Increase chances of finding the ellipsis glyph in elided textKonstantin Ritt2016-03-071-2/+1
| | * Fix UB in QFontEngineFT::loadGlyph()Marc Mutz2016-03-051-1/+1
* | | QtGui: de-duplicate calls and cache resultsAnton Kudryavtsev2016-03-131-4/+5
|/ /
* | QFontEngine: use RAII for font_, face_ membersMarc Mutz2016-03-045-50/+59
* | QtGui: use printf-style qWarning/qDebug where possible (I)Marc Mutz2016-03-049-21/+21
* | QtGui: mark some more types as movable/primitiveMarc Mutz2016-03-039-0/+18
* | QVector: preserve capacity in clear()Marc Mutz2016-02-292-2/+2
* | QtGui: use reserve to optimize memory allocation.Anton Kudryavtsev2016-02-251-0/+2
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-244-19/+42
|\ \ | |/
| * Disable ligatures using existing mechanism in HB, not workaroundEskil Abrahamsen Blomfeldt2016-02-243-25/+12
| * QFontEngineFT: Fix Clang warning about using uninitialized variables.Friedemann Kleint2016-02-211-2/+2
| * Qt Quick: Fix selection when mixing line breaks and line wrapsEskil Abrahamsen Blomfeldt2016-02-191-9/+10
| * Disable unneeded ligatures when letter spacing is setEskil Abrahamsen Blomfeldt2016-02-194-5/+40
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-188-16/+18
|\ \ | |/
| * Doc: Fixed Qt::TextWordBreak to Qt::TextWordWrapSamuel Gaist2016-02-151-2/+2
| * Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-02-156-10/+12
| |\
| | * Merge 5.6 into 5.6.0Oswald Buddenhagen2016-02-023-30/+45
| | |\
| | * | Fix bounding rect of glyph runs in multi-line QTextLayoutEskil Abrahamsen Blomfeldt2016-01-301-0/+3
| | * | Revert some changes to QTextCursor constructorshjk2016-01-284-7/+6
| | * | Fix artihmetic exception when using non-scalable fontsEskil Abrahamsen Blomfeldt2016-01-261-3/+3
| * | | QtGui: Use QImage::constBits()/constScanLine() in non-const contexts.Friedemann Kleint2016-02-131-4/+4
* | | | Use QFlags::setFlag where prudent in qtbaseAndre Somers2016-02-121-4/+1
* | | | QTextFrame::iterator: restore nothrow move special membersMarc Mutz2016-02-122-5/+9
* | | | QtGui: eradicate Q_FOREACH loops [const-& returns]Marc Mutz2016-02-111-3/+6
* | | | QtGui: eradicate Q_FOREACH loops [needing qAsConst()]Marc Mutz2016-02-112-8/+8
* | | | QtGui: eradicate Q_FOREACH loops [already const]Marc Mutz2016-02-114-6/+6
* | | | QtGui: eradicate Q_FOREACH loops [QVarLengthArray]Marc Mutz2016-02-111-1/+1
* | | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-113-13/+10
|\ \ \ \ | |/ / /
| * | | Provide QCss with the correct font for <pre> blocksAleix Pol2016-02-091-7/+1
| * | | Reduce allocations by using reserve()Sérgio Martins2016-02-072-6/+9
| | |/ | |/|
* | | Replace some QList<int> with QVector<int>Marc Mutz2016-02-082-9/+9
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-023-30/+45
|\ \ \ | |/ /
| * | QFont: Fix possible cache misses due to misprepared cache keyKonstantin Ritt2016-01-291-12/+12
| * | QFontCache: Centralize the engine type safety checkKonstantin Ritt2016-01-282-3/+8
| * | QFont*: Optimize by caching the QFontCache::instance() resultKonstantin Ritt2016-01-262-11/+17
| * | Deduplicate and clarify the code a bitKonstantin Ritt2016-01-261-2/+5
| * | Avoid needless string comparisonKonstantin Ritt2016-01-261-2/+3
| |/
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-268-62/+70
|\ \ | |/
| * Hide better the private API QTextCursor constructorsThiago Macieira2016-01-227-16/+24
| * QtPlatformSupport: Remove virtual from declarations with override.Friedemann Kleint2016-01-211-46/+46
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-215-9/+26
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-194-3/+14
| |\
| | * The cache_cost is measured in bytes and not kilobytes.Andy Shaw2015-12-162-2/+2