summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativetext.cpp
Commit message (Expand)AuthorAgeFilesLines
* Update copyright headersAkseli Salovaara2015-03-311-13/+13
* Updated year in copyright headerKai Koehne2014-03-261-1/+1
* Update copyright year in Digia's license headersSergio Ahumada2013-01-131-1/+1
* Fix g++/MinGW compiler warnings.Friedemann Kleint2012-09-291-1/+0
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291-24/+24
* Update contact information in license headers.Sergio Ahumada2012-08-011-2/+2
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
* Fix alignment of non-wrapped richtext QML Text elements.Miikka Heikkinen2011-11-161-1/+1
* Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-311-4/+4
|\
| * Doc: Standardized on QtQuick for \since declarations.David Boddie2011-08-301-4/+4
* | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-261-4/+4
|\|
* | Doc: Standardized on QtQuick for \since declarations.David Boddie2011-07-011-4/+4
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-311-7/+2
|\|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-281-7/+2
| |\
| | * Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA...Joona Petrell2011-05-271-7/+2
| * | Update licenseheader text in source filesJyri Tahtela2011-05-131-17/+17
| |/
* | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
* | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-231-5/+18
|\|
| * Elide has unexpected effect on Text's implicitWidthMartin Jones2011-04-211-5/+18
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-221-2/+2
|\|
| * Text bounding rect calculated incorrectly if non-top aligned.Martin Jones2011-03-221-2/+2
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-127/+149
|\|
| * Fix horizontal alignment of QTextDocument-based RTL textJoona Petrell2011-03-091-14/+31
| * Revert to previous lineHeight behavior.Martin Jones2011-03-091-0/+1
| * Use the text layout bounds calculated by QLayout.Martin Jones2011-03-081-45/+28
| * Base empty QML editor horizontal alignment on QApplication::keyboardInputDire...Joona Petrell2011-03-081-1/+2
| * Reverse horizontal alignment of QML editors when the layout mirroring is enabledJoona Petrell2011-03-071-29/+66
| * Removal of text alignment layout direction dependency was missing couple of c...Joona Petrell2011-03-041-2/+0
| * Fix RTL multiline Text drawingMartin Jones2011-03-041-55/+20
| * Remove text alignment of empty QML editors following the layout directionJoona Petrell2011-03-041-4/+1
| * Merge branch '4.7' into qtquick11Martin Jones2011-03-021-7/+32
| |\
| * | Make sure horizontal QML editor text aligment always returns the actual align...Joona Petrell2011-03-011-22/+45
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-011-0/+4
|\ \ \ | | |/ | |/|
| * | fix/improve docs for new QtQuick 1.1 attributesBea Lam2011-02-281-0/+4
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-11/+34
|\| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-091-5/+7
| |\|
| | * Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from m...Yann Bodson2011-02-091-5/+7
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-02-051-7/+28
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-261-4/+13
| | |\
| | * | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-241-7/+28
* | | | Revert part of commit 7c1ab9b6a8Olivier Goffart2011-02-091-23/+0
|/ / /
* | | Doc fix for lineHeight.Yann Bodson2011-01-281-1/+3
* | | Add support for line spacing in Text element.Yann Bodson2011-01-281-3/+81
* | | Fixing right-to-left text in Text and TextInputChristopher Ham2011-01-281-6/+18
* | | Fix MaximumLineCount in Text and add testsChristopher Ham2011-01-281-24/+20
* | | Expose implicitWidth and implicitHeight properties of Item.Martin Jones2011-01-241-6/+56
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191-5/+14
|\ \ \ | | |/ | |/|
| * | Request font sizes with only 0.5pt resolution.Martin Jones2011-01-181-4/+13
| |/
| * Update copyright year to 2011.Jason McDonald2011-01-111-1/+1
* | Add lineCount property to QDeclarativeTextEditChristopher Ham2011-01-141-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 14:09:59 +0000