summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7Eskil Abrahamsen Blomfeldt2010-02-15680-25919/+43818
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-123-9/+27
| |\
| | * Turned off subpixel AA text on surface with alpha in GL2 engine.Kim Motoyoshi Kalland2010-02-112-7/+25
| | * Changed a couple of GL defines from decimal to hex.Kim Motoyoshi Kalland2010-02-111-2/+2
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-111-3/+2
| |\ \
| | * | Fixed cleaning of both undo- and redo-stacks.Erik Verbruggen2010-02-111-3/+2
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-111-0/+14
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-02-1111-298/+475
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-1119-129/+473
| |\ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1011-298/+475
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Assistant: Remove assertion for all files being watched.ck2010-02-101-9/+13
| | * | | Fixed regression.Erik Verbruggen2010-02-101-4/+4
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1010-289/+462
| | |\ \ \ | |/ / / /
| | * | | Added method to clear the undo/redo stacks.Erik Verbruggen2010-02-094-22/+67
| | * | | Fixed setting back spaces when streaming a QPointFThorbjørn Lindeijer2010-02-091-1/+1
| | * | | Move find widget in it's own source file. Some further cleanup.kh12010-02-095-266/+394
| | | | * Added \since 4.7 tagsGunnar Sletta2010-02-101-0/+14
| | | |/
| | | * Added geometry shaders to changes-4.7.0 file + a small doc update about itGunnar Sletta2010-02-102-0/+5
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-02-10227-7592/+5821
| | | |\
| | | | * Crash when deleting the parent of a context menu while it is being displayedGabriel de Dietrich2010-02-109-16/+90
| | | | * Workaround for a certain functionally challenged compileraavit2010-02-101-3/+3
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-106-107/+146
| | | | |\ | | |_|/ / | |/| | |
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-096-107/+146
| | | | |\
| | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-02-091-5/+5
| | | | | |\
| | | | | | * Fix failing QDoubleValidator testsAlan Alpert2010-02-091-5/+5
| | | | | * | Use libpng API as recommended. Preparation for upgrade to libpng 1.4.0.aavit2010-02-091-73/+62
| | | | | |/
| | | | | * QMainWindow: update the separator size when the style changeOlivier Goffart2010-02-084-29/+79
| * | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-10151-5887/+2762
| |\ \ \ \ \
| | * \ \ \ \ Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-09151-5887/+2762
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1018-233/+390
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-0918-233/+390
| | |\ \ \ \ \ | |/ / / / / /
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-0818-233/+390
| | |\ \ \ \ \
| | | * | | | | Compile fix for embedded.Denis Dzyubenko2010-02-084-10/+0
| | | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-0818-233/+400
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-0818-233/+400
| | | | |\ \ \ \ \
| | | | | * | | | | Revised fix for system tray popup activationJens Bache-Wiig2010-02-051-1/+4
| | | | | * | | | | Fixed draggabletext example.Denis Dzyubenko2010-02-051-1/+1
| | | | | * | | | | Added new mouse cursor types.Denis Dzyubenko2010-02-0513-231/+381
| | | | | * | | | | Doc: more \since 4.7Volker Hilsheimer2010-02-052-0/+6
| | | | | * | | | | Doc: add \since 4.7 to new functions.Volker Hilsheimer2010-02-051-0/+8
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-0946-1348/+2432
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | / / / | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Assistant: Add missing license header.ck2010-02-092-7/+34
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-0846-1348/+2405
| | |\ \ \ \ \ \ \ | |/ / / / / / / /
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-0846-1348/+2405
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Compile fixes.ck2010-02-085-12/+18
| | | * | | | | | S60 style: Compile fix.Friedemann Kleint2010-02-081-1/+1
| | | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-0844-1347/+2398
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | A few trivial optimizationsThorbjørn Lindeijer2010-02-054-9/+9
| | | | * | | | | Rewrote bookmark handling, the previous code was just plain awful.kh12010-02-0519-1199/+2174
| | | | * | | | | Small style cleanup.kh12010-02-051-6/+4