summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-01-213428-7209/+12276
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-203-11/+44
| |\
| | * 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-206-17/+32
| |\ \
| | * | 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
| | |/ /
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-203389-4766/+6728
| | |\ \
| | | * \ 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-201-7/+14
| | * | | | 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
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | 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 branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-202-18/+13
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Generic solution for plugin stub exports for IBY usageMiikka Heikkinen2010-01-202-18/+13
| * | | | QMetaObject::disconnectOne()Aaron Kennedy2010-01-203-7/+29
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-1911-10/+34
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Memory leak in native Toolbar cleanup in CocoaNils Jeisecke2010-01-191-0/+11
| | * | | Fix copyright year.Jason McDonald2010-01-196-6/+6
| | * | | Bump version to 4.6.2.Jason McDonald2010-01-193-4/+4
| | * | | Designer crashes when previewing QMainWindow with native Toolbar on MacPrasanth Ullattil2010-01-191-0/+13
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-193-15/+65
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Make the qWarnings in the animation API more useful.Alexis Menard2010-01-191-5/+12
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-191-6/+45
| | |\ \ \
| | | * | | Fix X11/EGL builds using OpenGL ES 1.1Tom Cooksey2010-01-191-6/+45
| | * | | | Fixed y-inverted pixmaps on N900.Gunnar Sletta2010-01-191-4/+8
| | |/ / /
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-192-3/+19
| |\ \ \ \
| | * | | | QNativeSocketEngine windows: Fix performance degredation in write()Markus Goetz2010-01-191-2/+11
| | * | | | Remove QtScript connection when receiver QObject has been deletedKent Hansen2010-01-191-1/+8
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-191-17/+28
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-181-17/+28
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-161-17/+28
| | | |\ \ \
| | | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-151-17/+28
| | | | |\ \ \
| | | | | * | | use same small color dialog on S60 and Maemo 5Harald Fernengel2010-01-151-17/+28
| * | | | | | | Enhance QFileNetworkReplyMarkus Goetz2010-01-184-65/+48
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-183-56/+64
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix QSslCertificate issuesMarkus Goetz2010-01-181-2/+12
| | * | | | | | QFile::readData: Simplify codeJoão Abecasis2010-01-181-6/+2
| | * | | | | | If the file is open, there must be an engine.João Abecasis2010-01-181-6/+9
| | * | | | | | QFile: Fix a pre-mature pessimizationJoão Abecasis2010-01-181-44/+42
| | * | | | | | don't assert when calling QtScript-wrapped method of deleted QObjectKent Hansen2010-01-181-1/+2
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-189-13/+13
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Workaround for compiler error with MWCC (Symbian emulator)Shane Kearns2010-01-188-12/+12
| | * | | | | | Remove qmake warning by using appropriate variable.axis2010-01-181-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-181-0/+10
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |