summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * Decrease the cache if necessary when adding a new fontAndy Shaw2015-12-162-1/+12
| * | Lock qfontdatabase mutex in qt_fallbacksForFamilyAllan Sandfeld Jensen2016-01-151-6/+12
* | | Updated license headersJani Heikkinen2016-01-1584-1176/+1680
* | | QStaticTextItem: use smart pointer membersMarc Mutz2016-01-122-60/+11
* | | QSyntaxHighlighterPrivate: use erase and std::remove_if with QVectorAnton Kudryavtsev2016-01-111-9/+11
* | | Merge remote-tracking branch 'origin/5.6' into devFrederik Gladhorn2016-01-081-3/+3
|\| |
| * | Fix broken permission to mode mappingFrank Meerkoetter2015-12-191-3/+3
* | | Make use of new QHash::erase(const_iterator) overloadMarc Mutz2015-12-191-2/+2
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-182-5/+56
|\| |
| * | Cache font fallback families to reduce startup timeKonstantin Ritt2015-12-161-3/+52
| * | Use the cached font fallback families list in QFont::defaultFamily()Konstantin Ritt2015-12-151-2/+4
* | | Merge remote-tracking branch 'origin/5.6' into devSimon Hausmann2015-12-082-4/+8
|\| |
| * | Doc: Clarified QTextTable::mergeCells() documentationNico Vertriest2015-12-031-2/+2
| * | Freetype font engine: Restrict bold depending on OS2 weight class.Friedemann Kleint2015-12-031-2/+6
* | | Give names to enum used in templates.Rolland Dudemaine2015-12-041-1/+1
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-022-5/+14
|\| |
| * | Round advances if subpixel position not supportedEskil Abrahamsen Blomfeldt2015-12-021-5/+5
| * | QTextOdfWriter: Added support for hyperlinks.Ilija Ristevski2015-11-301-0/+9
* | | Use Q_UNLIKELY for every qFatal()/qCritical()Marc Mutz2015-11-291-1/+1
* | | Make a couple of iterators trivially-copyable in Qt 6Sérgio Martins2015-11-292-0/+8