summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-2110-62/+107
|\
| * QtHelp: Enable dynamic translation.ck2010-01-214-20/+63
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-216-42/+44
| |\
| | * Designer: Fixed a crash when previewing in a non-existent style.Friedemann Kleint2010-01-211-0/+2
| | * uic3: Introduced option to preserve layout object names of Designer 3.Friedemann Kleint2010-01-215-42/+42
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-212-0/+34
|\ \ \ | |/ / |/| |
| * | Menubar and dock disappear after hiding a fullscreen widget on Cocoa.Carlos Manuel Duclos Vergara2010-01-211-0/+32
| * | Changelog.Carlos Manuel Duclos Vergara2010-01-211-0/+2
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-211-3/+0
|\ \ \ | |/ / |/| |
| * | Fix semitransparent windows with DirectFBAnders Bakken2010-01-211-3/+0
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-201-3/+3
|\ \ \
| * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-2099-467/+1202
| |\ \ \
| * | | | Doc: Fixed some earlier incorrect documentation fixes.David Boddie2010-01-201-3/+3
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-207-11/+171
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | 1st attempt at USB serial port enumerator for linuxShane Kearns2010-01-204-0/+127
| * | | | Corrected alphabetic order in the docs for events.axis2010-01-201-1/+1
| * | | | Implemented event filter functions for Symbian.axis2010-01-202-10/+43
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-208-18/+83
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | QGraphicsItem::hasFocus() performance regression.Bjørn Erik Nilsen2010-01-201-1/+8
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2010-01-201-2/+2
| |\ \ \ \
| | * | | | Fix crashes in QByteArrayOlivier Goffart2010-01-201-2/+2
| * | | | | Move the labels a bit down so that they align better vertically with the field.Jan-Arve Sæther2010-01-201-3/+3
| |/ / / /
| * | | | Add command to qmake to do symbian-uid generationThomas Zander2010-01-201-1/+13
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-209031-12652/+15697
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-201-1/+5
| | |\ \ \ \
| | | * | | | Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers.Trond Kjernåsen2010-01-201-1/+5
| * | | | | | Fixed QBitmap::load to load into bitmap format again.Gunnar Sletta2010-01-202-7/+52
| * | | | | | Text drawing is not fast currentlyGunnar Sletta2010-01-151-3/+0
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-2011-28/+74
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-01-2022-52/+273
| |\ \ \ \ \ \
| | * | | | | | Avoid calling WSAGetLastError() so often in nativeWriteMarkus Goetz2010-01-201-3/+3
| | * | | | | | Cocoa: Fix painting errors on QGLWidget resizing.Morten Johan Sørvig2010-01-201-1/+1
| | * | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-209-24/+70
| * | | | | | | Merge commit 'upstream/4.6.1' into 4.6Jason McDonald2010-01-200-0/+0
| |\ \ \ \ \ \ \
| | * | | | | | | fix qm generation under windowsv4.6.1Oswald Buddenhagen2010-01-151-1/+1
| | * | | | | | | More changelog additions for QtWebKitJason McDonald2010-01-141-0/+2
| | * | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-144-1/+18
| | * | | | | | | fixes MMF plugin for Phonon when buidling with WINSCWEspen Riskedal2010-01-147-11/+11
| | * | | | | | | Update my changelog for 4.6.1Thiago Macieira2010-01-141-1/+1
| | * | | | | | | My changes for 4.6.1Jason McDonald2010-01-141-0/+75
| | * | | | | | | doc: Corrected parameter value in snippet.Martin Smith2010-01-141-1/+1
| | * | | | | | | doc: This bug wasn't really a bug; it just required clarification.Martin Smith2010-01-142-9/+12
| | * | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-143-1/+22
| | * | | | | | | Polish the changes file.Jason McDonald2010-01-131-169/+95
| | * | | | | | | Copy changes file from 4.6 branch.Jason McDonald2010-01-131-6/+90
| | * | | | | | | Merge branch '4.6.1' of git@scm.dev.nokia.troll.no:qt/qt-releases into 4.6.1Jason McDonald2010-01-137-45/+178
| | |\ \ \ \ \ \ \
| | | * | | | | | | fix sametext and number heuristicsOswald Buddenhagen2010-01-137-45/+178
| | * | | | | | | | Changed log updatedPrasanth Ullattil2010-01-131-1/+6
| | * | | | | | | | Update change log with Yoann Lopes work.Yoann Lopes2010-01-131-0/+19
| | * | | | | | | | Update changelog with some of my stuffMarkus Goetz2010-01-131-4/+17