summaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquicktext.cpp
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
* | 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
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-04-131-1/+4
|\ \ | |/
| * Fix Text item linkColor updateMarko Kangas2015-04-011-1/+4
* | Text: add support for paddingJ-P Nurmi2015-03-171-26/+230
|/
* Fix invocations of static methods of QGuiApplication/QCoreApplication.Friedemann Kleint2015-03-051-1/+1
* Avoid assert in rich text when img width is invalidEskil Abrahamsen Blomfeldt2015-03-021-2/+2
* Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-241-2/+2
|\
| * Merge remote-tracking branch 'origin/5.4.1' into 5.4Frederik Gladhorn2015-02-101-1/+1
| |\
| | * QQuickTextItem: fix crash on polishingGiuseppe D'Angelo2015-01-291-1/+1
| * | Fix Text wrapping when growing from 0 width.Michael Brasser2015-02-031-1/+1
| |/
* | QQuickText: Move baseUrl to ExtraData.Robin Burchell2015-02-121-4/+7
* | QQuickText: Decrease the size of QQuickTextPrivate by moving image tags to Ex...Robin Burchell2015-02-121-48/+63
* | Update copyright headersJani Heikkinen2015-02-121-7/+7
* | QQuickText: respect new line width set by lineLaidOut() handler.Dmitry Volosnykh2015-01-211-6/+6
|/
* Fix grammatical error in Text and TextEdit documentation.Mitch Curtis2015-01-091-1/+1
* Fix QQuickText alignment when lineHeight is setDaiwei Li2014-12-161-3/+14
* Invalidate font caches when switching between threadsv5.4.0-rc1Eskil Abrahamsen Blomfeldt2014-11-131-3/+42
* Relayout rich text when width increasesEskil Abrahamsen Blomfeldt2014-10-231-1/+0
* Update license headers and add new licensesJani Heikkinen2014-08-251-19/+11
* QQuickText::itemChange must call QQuickItem::itemChangeShawn Rutledge2014-08-081-0/+1
* Clear the visibleImgTags list when setting up the text layoutAndy Shaw2014-07-241-1/+2
* Binding Text width to implicitWidth can result in incorrect layoutMartin Jones2014-07-111-2/+3
* Doc: correct link/compilation errors in Qt DeclarativeNico Vertriest2014-07-021-1/+1
* Fix typo in QQuickText documentation.Mitch Curtis2014-05-071-1/+1
* Doc: Fix broken \qmlsignal linksSze Howe Koh2014-03-181-1/+1
* Doc: Document signals (not handlers) under \qmlsignalSze Howe Koh2014-03-181-6/+12
* Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-02-111-0/+4
|\
| * Docs: add a working example to Text::fontSizeMode docsJ-P Nurmi2014-01-291-0/+4
* | Expose Text::linkAt(x, y)J-P Nurmi2014-01-291-2/+17
* | Allow renderType: Text.NativeRendering on retina displays/devicesTor Arne Vestbø2014-01-271-4/+1
* | Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-01-241-4/+4
|\ \ | |/
| * QQuickText: fix layout mirroringJ-P Nurmi2014-01-221-4/+4
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-161-49/+49
|\ \ | |/
| * Doc: Change the order of QQuickText function definitionsTopi Reinio2013-11-301-49/+49
* | QQuickTextDocumentWithImageResources: use QTextDocument::baseUrlJ-P Nurmi2013-12-041-19/+8