summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-037-102/+126
|\
| * Fix photo positioning bug in flickr demo.Yann Bodson2010-08-033-87/+87
| * Fix Flickable.StopAtBounds behavior when content size < flickable sizeMartin Jones2010-08-031-10/+16
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-0342-110/+915
| |\
| * | Ensure dataChanged doesn't force request for unwanted data in QML views.Martin Jones2010-08-033-5/+23
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-0318-42/+677
|\ \ \ | | |/ | |/|
| * | Make it possible to manually set the orientation of QML Viewer on SymbianJoona Petrell2010-08-0315-35/+611
| * | Limit the pixmap cache in space as well as in time.Aaron Kennedy2010-08-033-7/+66
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-08-021-1/+1
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-08-021-1/+1
| |\ \
| | * | Fixed configure on Solaris.Rohan McGovern2010-08-021-1/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-029-41/+112
|\ \ \ \
| * | | | 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
| | |\ \ \ \ | | | |/ / / | | |/| | |
| * | | | | 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-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-0214-26/+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
| * | | | | | | | Enabled tst_mediaobject::testPlayFromResource on SymbianGareth Stockwell2010-08-021-4/+0
| * | | | | | | | 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.7-integrationQt Continuous Integration System2010-08-0211-84/+288
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-025-82/+227
| |\ \ \ \ \ \
| | * | | | | | State doc fixes, improvementsBea Lam2010-08-025-82/+227
| * | | | | | | 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-025-1/+51
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Correctly apply PropertyChanges when entering an extended stateMichael Brasser2010-08-023-1/+45
| | * | | | | | 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.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
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | 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