aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquicktext.cpp
Commit message (Expand)AuthorAgeFilesLines
* QQuickText: don't clear the text formats on every layoutJ-P Nurmi2017-07-061-4/+11
* Expose "kerning" property for fontsEskil Abrahamsen Blomfeldt2017-06-301-0/+13
* Add advance property to QQuickTextEskil Abrahamsen Blomfeldt2017-05-191-0/+47
* Merge remote-tracking branch 'origin/5.9' into devLars Knoll2017-05-021-0/+2
|\
| * Run includemocs in qtdeclarativeThiago Macieira2017-04-261-0/+2
* | QQuickText: apply updateSize() optimization for item change listenersJ-P Nurmi2017-04-251-2/+2
|/
* QQuickText: optimize updateLayout()Anton Kudryavtsev2017-04-181-8/+2
* Add fontInfo property to TextEskil Abrahamsen Blomfeldt2017-01-311-1/+88
* Deprecate Text::doLayout() in favor of forceLayout()J-P Nurmi2017-01-141-1/+13
* Port existing qmlInfo callers to qmlWarningRobin Burchell2017-01-111-1/+1
* Get rid of most QT_NO_FOO usagesLars Knoll2016-11-291-3/+3
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-101-3/+3
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-301-3/+3
| |\
| | * Fix incorrectly aligned text whose size depends on its implicit sizeMitch Curtis2016-09-291-2/+2
| | * QQuickText: fix paddings when wrapping or eliding is usedJ-P Nurmi2016-09-291-1/+1
* | | Quick: replace 'foreach' with 'range for'Anton Kudryavtsev2016-08-181-5/+6
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-171-0/+1
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-131-0/+1
| |\|
| | * Don't accept left clicks when text format is plain.Eike Hein2016-08-091-0/+1
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-211-1/+4
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-201-1/+4
| |\|
| | * Fix positioning of inline images in StyledText.Michael Brasser2016-06-161-1/+4
* | | categorized logging: trace hover eventsShawn Rutledge2016-06-151-0/+2
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-241-0/+5
|\| |
| * | Don't render when width is zero and elide is not NoneKari Hautamäki2016-05-201-0/+5
* | | Add property for setting hinting preference on fontsEskil Abrahamsen Blomfeldt2016-03-151-0/+33
|/ /
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-191-1/+18
|\|
| * Rerender natively rendered text items when DPI scaling changes.Andreas Hartmetz2016-02-051-1/+18
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-291-2/+2
|\|
| * Preparations for re-rendering native text on DPI scaling changes.Andreas Hartmetz2016-01-261-2/+2
* | Merge remote-tracking branch 'origin/5.6' into devSimon Hausmann2016-01-221-1/+1
|\|
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-191-1/+1
| |\
| | * QQuickTextLine: set lineOffset to zero in ctor5.5Anton Kudryavtsev2015-12-171-1/+1
* | | Updated license headersJani Heikkinen2016-01-191-14/+20
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-031-147/+1
|\| |
| * | Move QQuickTextDocumentWithImageResources out of qquicktext_p_p.hJ-P Nurmi2015-10-291-143/+1
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-261-21/+17
| |\|
| | * Fix QQuickTextDocumentWithImageResources image loadingRoman Pasechnik2015-10-151-21/+17
* | | Add a way to set default font rendering at build time.Stephen Kelly2015-10-131-0/+4
|/ /
* | Fix baseline of text with vertical align != TopEskil Abrahamsen Blomfeldt2015-09-241-4/+5
* | QQuickText: add a protected constructorLiang Qi2015-09-081-0/+7
* | Doc: Corrected link errorsNico Vertriest2015-09-071-1/+1
* | Merge remote-tracking branch 'origin/5.5' into 5.6Ulf Hermann2015-08-181-1/+4
|\|
| * qquicktext: Fix using CSS line-height with RichTextKai Uwe Broulik2015-07-201-1/+4
* | Font matching by font stylenameAllan Sandfeld Jensen2015-08-101-0/+10
* | QQuickText: move padding into extraDataLiang Qi2015-06-151-13/+15
* | Fix users of QTextLayout::additionalFormats to use the new APIMarc Mutz2015-06-051-7/+7
* | Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-06-041-1/+40
|\|
| * Add QtQuick::Text::font.weight enum valuesShawn Rutledge2015-05-111-0/+4
| * Fix implicitHeight for Text items bindings dependent on implicitWidth.Andrew den Exter2015-05-041-0/+35