summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Some documentation fixesEskil Abrahamsen Blomfeldt2010-01-141-4/+7
* Support transformations in drawStaticText() and optimize for spaceEskil Abrahamsen Blomfeldt2010-01-149-61/+130
* Optimize QStaticText for spaceEskil Abrahamsen Blomfeldt2010-01-1410-110/+137
* Remove const-specifier to make QTextItemInt::operator=() more beautifulEskil Abrahamsen Blomfeldt2010-01-142-2/+2
* Respect font settings of QStaticText and clip to maximum sizeEskil Abrahamsen Blomfeldt2010-01-142-1/+22
* Support maximumSize for the layout of the text in a QStaticTextEskil Abrahamsen Blomfeldt2010-01-146-59/+279
* Speed optimization for QStaticTextEskil Abrahamsen Blomfeldt2010-01-146-23/+40
* Fix drawing in QStaticTextEskil Abrahamsen Blomfeldt2010-01-141-0/+1
* Space optimization in QStaticTextEskil Abrahamsen Blomfeldt2010-01-142-14/+9
* Optimize QStaticText for one line stringsEskil Abrahamsen Blomfeldt2010-01-146-85/+98
* Fix memory leakEskil Abrahamsen Blomfeldt2010-01-141-1/+3
* Compile on S60Eskil Abrahamsen Blomfeldt2010-01-141-0/+1
* CompileEskil Abrahamsen Blomfeldt2010-01-141-2/+2
* Add operators and implicit sharing to QStaticTextEskil Abrahamsen Blomfeldt2010-01-143-26/+91
* Remove ambiguous overload for QStaticText() constructorEskil Abrahamsen Blomfeldt2010-01-141-1/+0
* Add lazy initialization to QStaticTextEskil Abrahamsen Blomfeldt2010-01-143-12/+114
* doc: Add documentation for QStaticText and QPainter::drawStaticText()Eskil Abrahamsen Blomfeldt2010-01-142-3/+86
* Add convenience overloads to QPainter::drawStaticText()Eskil Abrahamsen Blomfeldt2010-01-141-0/+12
* Fix formatting/clipping rectangle in QPainter::drawStaticText()Eskil Abrahamsen Blomfeldt2010-01-144-9/+95
* Start support for formatting text within a bounding rectEskil Abrahamsen Blomfeldt2010-01-143-7/+7
* WhitespaceEskil Abrahamsen Blomfeldt2010-01-141-3/+2
* Fix position of QStaticText textEskil Abrahamsen Blomfeldt2010-01-141-1/+1
* Simplify QStaticTextEskil Abrahamsen Blomfeldt2010-01-143-52/+21
* Introduce QStaticText APIEskil Abrahamsen Blomfeldt2010-01-146-2/+222
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Alan Alpert2010-01-143376-4814/+6597
|\
| * Fix QGLWidget::renderPixmap() on Windows.Trond Kjernaasen2010-01-141-6/+6
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-1422-448/+530
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-1412-27/+62
| | |\
| | * | Rework how Qt handles GL extensions.Trond Kjernåsen2010-01-1315-428/+469
| | * | Make compile on symbian/LinuxThomas Zander2010-01-131-1/+1
| | * | Removed pointless image comparison in raster colorize filter.Samuel Rødal2010-01-131-1/+1
| | * | Improved performance of translating device coordinate graphics effects.Samuel Rødal2010-01-135-18/+59
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-1416-130/+68
| |\ \ \ | | |_|/ | |/| |
| | * | Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-1412-96/+49
| | * | Revert "Added setChannelCount() to QAudioFormat."Kurt Korbatits2010-01-148-34/+19
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-131-2/+5
| |\ \ \
| | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-1383-690/+2098
| | |\ \ \
| | * | | | Doc: Describe QStackedWidget::removeWidget() more thoroughly.David Boddie2010-01-131-2/+5
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-131-10/+11
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Use a QTextBrowser instead of a read only QTextEditHarald Fernengel2010-01-131-10/+11
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-1322-334/+419
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-134-8/+18
| | |\ \ \ \
| | | * \ \ \ Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2010-01-133376-3895/+5604
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-124-8/+18
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-114-8/+18
| | | | |\ \ \ \
| | | | | * | | | Do not set the font size unnecessarily in the simulated s60 style.Christian Kamm2010-01-114-8/+18
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-1317-325/+400
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | / | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Fixed tst_qgl multipleFBOInterleavedRendering.Samuel Rødal2010-01-131-1/+1
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-1317-325/+400
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-1217-325/+400
| | | | |\ \ \ \ \