summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* Better fix for build!=src Makefile generationThomas Zander2010-01-141-5/+3
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Alan Alpert2010-01-148977-11607/+14009
|\
| * 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-1427-472/+617
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-1487-956/+674
| | |\
| | * | Fix rules for recreating the Makefile in a subdirThomas Zander2010-01-131-8/+8
| | * | Disable some tests that require high floating point precision.Jan-Arve Sæther2010-01-132-3/+18
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2010-01-1325-449/+579
| | |\ \
| | | * | Rework how Qt handles GL extensions.Trond Kjernåsen2010-01-1315-428/+469
| | | * | More changelog additions for QtWebKitSimon Hausmann2010-01-131-0/+2
| | | * | 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-136-18/+105
| | * | | Replace the truncate function with fuzzierCompare().Jan-Arve Sæther2010-01-131-13/+13
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-1424-173/+111
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-1424-173/+111
| | |\ \ \ | |/ / / /
| | * | | Revert "Frequency to SampleRate and channels to channelCount." missedKurt Korbatits2010-01-141-20/+0
| | * | | Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-1418-116/+89
| | * | | Revert "Added setChannelCount() to QAudioFormat."Kurt Korbatits2010-01-1416-57/+42
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-142-1/+2
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Iain2010-01-138894-9441/+10896
| | |\ \ \ \
| | * | | | | Use MMP keyword, not compiler flags, to update FPU option on SymbianIain2010-01-132-1/+2
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-134-163/+168
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-13184-1528/+3165
| | |\ \ \ \ \ \
| | * | | | | | | Doc: Describe QStackedWidget::removeWidget() more thoroughly.David Boddie2010-01-131-2/+5
| | * | | | | | | Doc: Resized the window and added a title.David Boddie2010-01-121-160/+161
| | * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-11131-959/+2201
| | |\ \ \ \ \ \ \
| | * | | | | | | | Doc: Added a missing example to the list of Graphics View examples.David Boddie2010-01-111-0/+1
| | * | | | | | | | Doc: Clarified why a path matches in the example given.David Boddie2010-01-081-1/+1
| * | | | | | | | | 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/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-139-26/+104
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | / / / / / / | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-1394-1093/+1072
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |