summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-028-41/+47
|\
| * QDesktopServices crashes when accessing the NULL X11 variableHurewitz Kevin2010-08-021-4/+8
| * Revert "Fix the byte order in QImage::fill for 24bpp formats"Olivier Goffart2010-08-021-1/+1
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-08-021-11/+37
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-027-37/+34
| | |\
| * | | Fix crash when setting font decorations on text drawn with QStaticTextEskil Abrahamsen Blomfeldt2010-08-021-1/+6
| | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-317-37/+34
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-317-37/+34
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-307-37/+34
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-297-37/+34
| | | | |\ \
| | | | | * | Fix the rendering of lines with the X11 paint engineBenjamin Poulain2010-07-291-12/+10
| | | | | * | Fix the byte order in QImage::fill for 24bpp formatsJohn Brooks2010-07-291-1/+1
| | | | | * | QScript: remove JSC::JSLockOlivier Goffart2010-07-291-4/+0
| | | | | * | QScript: document/obsolete things that does not work since the move to JSCOlivier Goffart2010-07-295-20/+23
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-0213-22/+125
|\ \ \ \ \ \ \
| * | | | | | | Fixed build break on Symbian versions earlier than S^3Gareth Stockwell2010-08-021-1/+1
| * | | | | | | Fixed qsymbianbearer.qtplugin exports in s60installs.proMiikka Heikkinen2010-08-021-2/+2
| * | | | | | | Added support to Phonon MMF backend for playback of Qt resource filesGareth Stockwell2010-08-0212-20/+123
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-021-14/+1
|\ \ \ \ \ \ \
| * | | | | | | State doc fixes, improvementsBea Lam2010-08-021-14/+1
* | | | | | | | Ensure currentItem is released when the delegate changesMartin Jones2010-08-022-0/+7
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-023-1/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Correctly apply PropertyChanges when entering an extended stateMichael Brasser2010-08-021-1/+3
| * | | | | | | Update QtGui def filesJoona Petrell2010-08-022-0/+6
| |/ / / / / /
* | | | | | | Make sure ListView.nextSection attached property is set for the first itemMartin Jones2010-08-021-1/+3
|/ / / / / /
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-0265-364/+827
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-3117-66/+241
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-3017-66/+241
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-3017-66/+241
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Add missing imageBea Lam2010-07-301-1/+1
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-2917-65/+240
| | | | |\ \ | | | | | |/ | | | | |/|
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-305-237/+301
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fixed a broken def file entry.axis2010-07-302-2/+2
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-293-235/+299
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Fixed key event handling on Symbian.axis2010-07-292-55/+118
| | | * | | Cleaned up old comments.axis2010-07-291-12/+0
| | | * | | Refactored the virtual mouse handling code into its own function.axis2010-07-292-171/+181
| | | * | | Removed static on a member that didn't have to be.axis2010-07-292-5/+8
| | | |/ /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-3023-65/+393
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-3023-65/+393
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Updated WebKit to e6e692bb056670e2781dd0bc473a60757ae53992Simon Hausmann2010-07-2923-65/+393
| * | | | | QFileDialog crashes when empty selectedFilter is set on Carbon.Prasanth Ullattil2010-07-301-3/+5
| |/ / / /
| * | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-07-293-3/+11
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-07-293-3/+11
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-07-293-3/+11
| | | |\ \
| | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-07-284-20/+47
| | | | |\ \
| | | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-07-274-20/+47
| | | | | |\ \
| | | | | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-07-274-20/+47
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-07-271-1/+6
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | Fix crash when all the items in a QListView are hiddenGabriel de Dietrich2010-07-271-1/+6
| | | | | |/ /