summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-023-66/+2
* 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-029-38/+164
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-021-11/+37
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-02146-665/+1856
| | |\ \ | | |/ / | |/| |
| | * | Reference count items in VisualItemModel.Martin Jones2010-08-021-11/+37
* | | | 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-319-38/+164
|\ \ \ | |/ / |/| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-319-38/+164
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-309-38/+164
| | |\ \
| | | * | Fix tst_QPainter::drawImage_task258776Olivier Goffart2010-07-301-1/+1
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-299-37/+163
| | | |\ \
| | | | * | Fix the rendering of lines with the X11 paint engineBenjamin Poulain2010-07-292-12/+75
| | | | * | Fix the byte order in QImage::fill for 24bpp formatsJohn Brooks2010-07-292-1/+65
| | | | * | 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-qml into 4.7-integrationQt Continuous Integration System2010-07-3159-760/+1932
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-3059-760/+1932
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-3059-760/+1932
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Add missing imageBea Lam2010-07-302-1/+1
| | | * | | Mention scope of id uniquenessBea Lam2010-07-302-1/+10
| | | * | | Update QML Documents exampleBea Lam2010-07-303-26/+98
| | | * | | add license headerHarald Fernengel2010-07-291-0/+41
| | | * | | doc: Add a note about QCoreApplication::applicationDirPathHarald Fernengel2010-07-291-0/+3
| | | * | | Add license headerHarald Fernengel2010-07-291-0/+41
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-2953-732/+1738
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-29124-616/+14782
| | | | |\ \ | | | | | |/
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-298-12/+22
| | | | | |\
| | | | | | * Add missing \l doc commandsBea Lam2010-07-294-4/+4
| | | | | | * Document elements that are focus scopes.Yann Bodson2010-07-294-8/+18
| | | | | * | Add moving and flicking properties to PathViewMartin Jones2010-07-2911-480/+939
| | | | | |/
| | | | | * Remove use of shared NOTIFY signals in QGraphicsScaleMartin Jones2010-07-292-3/+9
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-2997-80/+13724
| | | | | |\
| | | | | * | Remove use of shared NOTIFY signalsMartin Jones2010-07-2910-44/+89
| | | | * | | Improve utility of QMLViewerAaron Kennedy2010-07-2924-193/+679
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-316-256/+322
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-306-256/+322
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | 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-294-254/+320
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | 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
| | * | | | | Fixed a problem with dso dependencies.axis2010-07-291-19/+21
| | |/ / / /
* | | | | | 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
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-3020-14/+18
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixed the incorrect diagram for bug QTBUG-12385.Jerome Pasion2010-07-3018-0/+0