summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Prevent accelerators from firing on X11 and QWS during a dragBradley T. Hughes2010-04-172-0/+10
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-032-2/+2
|\
| * Fix a small typo: therfore -> thereforeLaszlo Papp2010-05-031-1/+1
| * Fix a small typo in setColor description (brush -> color)Laszlo Papp2010-05-031-1/+1
* | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-0212-64/+63
|\ \
| * \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-0212-64/+63
| |\ \ | | |/ | |/|
| | * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-0112-64/+63
| | |\
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-011-17/+40
| | | |\
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-301-17/+40
| | | | |\
| | | | | * Fix bold text rendering of Thai and Vietnamese on SymbianAlessandro Portale2010-04-301-17/+40
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-303-11/+8
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-303-11/+8
| | | | |\ \
| | | | | * | Fixed a leak in QTextDocument::print().Trond Kjernåsen2010-04-292-8/+5
| | | | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-291-3/+3
| | | | | |\ \
| | | | | | * | Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.Jan-Arve Sæther2010-04-291-3/+3
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-301-1/+1
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-301-1/+1
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | Fix crash in QDBusInterface when invoking a method in a derived class.Thiago Macieira2010-04-291-1/+1
| | | | | |/ /
| | | * | | | Event dispatcher slow down using delays rather than thread prioritymread2010-04-302-37/+95
| | | * | | | Fixed incorrect runtime platform version check in Phonon MMF backendGareth Stockwell2010-04-301-1/+1
| | | |/ / /
| | | * | | Removing unused code.Alessandro Portale2010-04-302-27/+2
| | | * | | Support 'Text' mode in Symbian specific input methodsSami Merila2010-04-291-1/+1
| | | * | | Map Symbian touch points to the screen's coordinate system.Jason Barron2010-04-291-1/+1
| | | * | | Revert "Event dispatcher slow down using delays rather than thread priority"Miikka Heikkinen2010-04-292-95/+37
| | | * | | Fix long menu item texts causing crashMiikka Heikkinen2010-04-291-2/+6
| | | |/ /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-02110-1671/+4581
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Updated WebKit to 540ae4ccd25609e1bfe1673195ce126255e36774Simon Hausmann2010-04-307-3/+87
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-30107-1671/+4497
| |\ \ \ \
| | * | | | Updated WebKit to 2c346f58ae70470d88dcd856bfe59b04a144b65aSimon Hausmann2010-04-304-32/+73
| | * | | | Updated WebKit to 1a40220a82197023c1b1ac6eff027be6dd3168d3Simon Hausmann2010-04-296-10/+31
| | * | | | Updated WebKit to 2992802f35fd47e32bb94a4b1f48cce7ec7fda9dSimon Hausmann2010-04-299-74/+174
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-28107-1578/+4242
| | |\ \ \ \
| | | * | | | Updated WebKit to 862268aeb7150d3795d05bfc05f661bb5c598a27Simon Hausmann2010-04-28107-1578/+4242
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-029-24/+85
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-309-24/+85
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | doc: Fixed some qdoc errors.Martin Smith2010-04-302-14/+1
| | * | | | | | Cocoa: key events stopped workingRichard Moe Gustavsen2010-04-301-0/+6
| | * | | | | | Set the enabled state on the page when changing the QTabWidgetKevin Ottens2010-04-291-0/+2
| | * | | | | | add QString::setRawData() and revive QByteArray::setRawData()Oswald Buddenhagen2010-04-294-10/+73
| | * | | | | | Secure Cookies should only be sent over secure connections.Robert Hogan2010-04-281-0/+3
| | |/ / / / /
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-029-13/+55
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-309-13/+55
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix libinfix usageThomas Zander2010-04-291-2/+1
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-288-11/+54
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Update symbian def files for 4.7Shane Kearns2010-04-285-3/+45
| | | * | | | Correction to EGL stub implementationShane Kearns2010-04-282-8/+6
| | | * | | | Fix 'make sis' when media services is disabled and multimedia is notThomas Zander2010-04-281-0/+3
* | | | | | | Fix the include header <qstring.h> -> <QtCore/qstring.h>Thiago Macieira2010-05-011-1/+1
* | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-3051-389/+638
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Testlib XML flush: use benchmarkMetricName (identifier) overall instead of be...Thiago Macieira2010-04-291-1/+1