summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qstatictext.cpp
Commit message (Expand)AuthorAgeFilesLines
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-011-3/+7
|\
| * Fix text color in some cases of QML and QStaticTextEskil Abrahamsen Blomfeldt2011-06-291-3/+7
| * 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
* | Put all the declarations of qt_defaultDpi{,X,Y}() in one placeJiang Jiang2011-04-051-3/+0
|/
* Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
* Fix possible crash in QStaticText and QDeclarativeTextLayoutEskil Abrahamsen Blomfeldt2010-10-291-1/+21
* Make QStaticText honor QPainter::pen() for rich text on X11 w/rasterEskil Abrahamsen Blomfeldt2010-09-201-1/+4
* Fix crash when using unprintable chars in QStaticTextEskil Abrahamsen Blomfeldt2010-09-101-2/+1
* Fix QStaticText copy constructor to also copy text option propertyEskil Abrahamsen Blomfeldt2010-09-031-3/+3
* doc: Clarify documentation of QStaticTextEskil Abrahamsen Blomfeldt2010-08-091-4/+12
* Fix crash when setting font decorations on text drawn with QStaticTextEskil Abrahamsen Blomfeldt2010-08-021-1/+6
* doc: Fix qdoc errors for text related filesEskil Abrahamsen Blomfeldt2010-07-201-3/+1
* Remove qMemCopy() usage from all .cpp files of Qt itself.Robin Burchell2010-07-181-6/+6
* Fix compiler warnings in QtGui (text,painting).Friedemann Kleint2010-06-211-5/+4
* Add QTextOption API to QStaticTextEskil Abrahamsen Blomfeldt2010-06-141-4/+30
* Speed up QStaticText with affine transformation on GL2 engineEskil Abrahamsen Blomfeldt2010-06-011-14/+23
* Replace memmove with memcpyEskil Abrahamsen Blomfeldt2010-05-271-6/+6
* Optimize initialization of QStaticTextEskil Abrahamsen Blomfeldt2010-05-271-77/+86
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-181-0/+2
|\
| * Fix building of corelib, network and gui with qconfig minimal.Aaron McCarthy2010-04-161-0/+2
* | Further RVCT4 fixes for SymbianIain2010-04-161-2/+2
|/
* Fix gcc compile warning in qstatictext.cppEskil Abrahamsen Blomfeldt2010-04-141-1/+1
* Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-04-011-0/+4
|\
| * Fix compile error with QT_NO_TEXTHTMLPARSER in QtGuiTasuku Suzuki2010-03-261-1/+4
* | Support the pen set on the painter in QStaticText when using rich textEskil Abrahamsen Blomfeldt2010-03-301-0/+5
* | Make QStaticText layout lazyEskil Abrahamsen Blomfeldt2010-03-291-27/+37
* | Change QStaticText::setMaximumSize() to setTextWidth()Eskil Abrahamsen Blomfeldt2010-03-291-37/+49
* | Respect QPainter::pen() in QPainter::drawStaticText()Eskil Abrahamsen Blomfeldt2010-03-291-3/+12
* | Synchronize rich text and plain text code paths in QStaticTextEskil Abrahamsen Blomfeldt2010-03-261-2/+4
|/
* doc: Fixed several qdoc errors.Martin Smith2010-03-091-2/+4
* Avoid always detaching QStaticTextEskil Abrahamsen Blomfeldt2010-02-241-2/+0
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-221-9/+12
|\
| * Fix fallback for QStaticText when it's unsupported in paint engineEskil Abrahamsen Blomfeldt2010-02-191-6/+9
| * Fix warnings on gccEskil Abrahamsen Blomfeldt2010-02-181-3/+3
* | Copy useBackendOptimization setting when QStaticText is detachedEskil Abrahamsen Blomfeldt2010-02-221-1/+1
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Jason McDonald2010-02-161-32/+43
|\
| * Rename QStaticText::setUseBackendOptimizations to setPerformanceHint()Eskil Abrahamsen Blomfeldt2010-02-161-20/+27
| * doc: Update documentation for QStaticTextEskil Abrahamsen Blomfeldt2010-02-161-12/+16
* | Fix license headers.Jason McDonald2010-02-161-18/+18
|/
* Separate out textFormat property from setText() function and removeEskil Abrahamsen Blomfeldt2010-02-151-20/+35
* Add API for rich text and getting actual size of QStaticTextEskil Abrahamsen Blomfeldt2010-02-141-22/+58
* Make QStaticText public API againEskil Abrahamsen Blomfeldt2010-02-101-1/+1
* Temporarily remove QPainter::drawStaticText() for Qt 4.6.x integrationEskil Abrahamsen Blomfeldt2010-02-051-38/+44
* Make QStaticText private APIEskil Abrahamsen Blomfeldt2010-02-011-1/+2
* Don't compare bool to char (avoid warning on MSVC)Eskil Abrahamsen Blomfeldt2010-02-011-1/+2
* doc: Add \since to QStaticTextEskil Abrahamsen Blomfeldt2010-02-011-0/+1
* Improve performance of QStaticText on OpenGL by caching data on GPUEskil Abrahamsen Blomfeldt2010-01-291-0/+43
* Remove unused constructor in QStaticTextPrivateEskil Abrahamsen Blomfeldt2010-01-291-10/+0