summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix broken text drawing in OpenGL engine when text items are too longEskil Abrahamsen Blomfeldt2010-02-021-3/+3
* Add experimental support for using drawElements to draw cached textEskil Abrahamsen Blomfeldt2010-02-021-3/+34
* Lock before calling drawStaticTextItemAnders Bakken2010-02-023-2/+12
* Make QRasterPaintEngine::drawStaticText public.Anders Bakken2010-02-021-2/+2
* Merge branch '4.6' into qstatictext-4.6Eskil Abrahamsen Blomfeldt2010-02-01437-3294/+8129
|\
| * Fixed garbled 3D Qt logo in the overpainting example.Kim Motoyoshi Kalland2010-02-011-0/+3
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-0121-132/+464
| |\
| | * fix crash in Phonon::DS9 backendJoerg Bornemann2010-02-011-0/+3
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2010-02-0188-245/+560
| | |\
| | | * Fixes missing update when setting opacity on an item that had opacity 0.0Leonardo Sobral Cunha2010-01-292-0/+42
| | | * Avoids missing opacity updates by not propagating the ignoreOpacity flagLeonardo Sobral Cunha2010-01-292-1/+41
| | | * Cleanup in graphicsitem autotestLeonardo Sobral Cunha2010-01-291-52/+16
| | | * Adds convenience functions QGraphicsItemPrivate::isOpacityNullLeonardo Sobral Cunha2010-01-293-7/+14
| | | * Fixed a crash when QPixmaps are destroyed after the ~QApplication.Trond Kjernåsen2010-01-292-3/+8
| | | * Fix GL texture leaks when pixmaps are deletedTom Cooksey2010-01-2912-67/+326
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-292-2/+14
| | | |\
| | * | | Don't crash when running Qt on KDE with Oxygen style.Jan-Arve Sæther2010-02-011-1/+1
| | | |/ | | |/|
| | * | Doc fix. No need to put something deprecated if it's not.Alexis Menard2010-01-291-2/+1
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2010-01-28115-565/+1408
| | |\ \
| | * | | Warn if the plugin seems to not exist instead of simply passing.Jan-Arve Sæther2010-01-281-0/+13
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-0117-63/+191
| |\ \ \ \
| | * | | | QPrintDialog::setPrinter(), QPrintDialog::printer(), QPrintDialog::addButton ...ulf2010-02-011-3/+3
| | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-2913-59/+183
| | * | | | Fix autotest memory leakKent Hansen2010-01-291-1/+1
| | * | | | Carbon: crash problem in QWidgetPrivate::hide_sys, v2Richard Moe Gustavsen2010-01-292-1/+3
| | * | | | Carbon: crash problem in QWidgetPrivate::hide_sysRichard Moe Gustavsen2010-01-291-0/+2
| | | |_|/ | | |/| |
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-011-10/+10
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-291-10/+10
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Assistant: Fix unintended tr context change.ck2010-01-291-10/+10
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-02-014-1/+122
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | audiodevices example: no devices availableKurt Korbatits2010-02-011-1/+4
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-293-0/+118
| | |\ \ \ \ | |/ / / / /
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-293-0/+118
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Add QFontMetrics benchmark.Michael Brasser2010-01-293-0/+118
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-2924-46/+46
| |\ \ \ \ \
| | * | | | | Fixed `make test' for xmlpatternsxqts.Rohan McGovern2010-01-291-1/+0
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-2823-45/+46
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Doc: Put the correct images with the D-Bus and Embedded Linux sections.David Boddie2010-01-281-2/+2
| | | * | | | Call cheaper clear() instead of assigning new QString()Markus Goetz2010-01-284-19/+19
| | | * | | | Fix some foreach usage to use const refsMarkus Goetz2010-01-285-6/+6
| | | * | | | googlesuggest example: Add newline to end of fileMarkus Goetz2010-01-282-2/+4
| | | * | | | Core classes, examples, demos: Some changes from string to charMarkus Goetz2010-01-2810-14/+15
| | | * | | | Fix header labels on mac with rtlJens Bache-Wiig2010-01-281-2/+0
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-2946-70/+68
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-2846-70/+68
| | |\ \ \ \ | |/ / / / /
| | * | | | Designer: Fix source code scanning issues.Friedemann Kleint2010-01-2846-70/+68
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-2812-9/+55
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2010-01-28110-643/+2880
| | |\ \ \
| | | * | | Fixed an endless loop if printing web pages.Trond Kjernåsen2010-01-281-0/+5
| | | * | | don't build unneeded QtDesigner parts on Windows CEJoerg Bornemann2010-01-281-3/+1