summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add the qt_ prefix to convert_rgb888_to_rgb32_ssse3Benjamin Poulain2010-08-032-4/+4
* Update changes-4.7.0Pierre Rossi2010-08-031-0/+3
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-036-55/+44
|\
| * Use the fast conversion from RGB888 to RGB32 for Jpeg imagesBenjamin Poulain2010-08-032-7/+25
| * Move the SIMD defines to the common declaration of Qt symbolsBenjamin Poulain2010-08-033-46/+15
| * Fixed: QT_DEPRECATED_WARNINGS defines QT3_SUPPORTOlivier Goffart2010-08-031-2/+4
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-0323-45/+111
|\ \
| * \ Merge branch 'symbian3Patches' into 4.7-s60axis2010-08-0323-45/+111
| |\ \ | | |/ | |/|
| | * Fixed incorrect values for QSysInfo::symbianVersion().axis2010-08-031-2/+2
| | * Switched from using hardlinks to copies in Symbian building.axis2010-08-031-1/+1
| | * Added SYMBIAN_VERSION variable to qmake.axis2010-08-032-3/+24
| | * Moved the S60 version detection to the common symbian profile.axis2010-08-032-18/+19
| | * Fixed circular dependency warning.axis2010-08-031-0/+1
| | * Fixed rvct.h header inclusion on Symbian^3.axis2010-08-031-2/+11
| | * Included libstdcppv5 support for the makefile build system.axis2010-08-031-7/+13
| | * Prevented makefile build system from using platform provided paths.axis2010-08-031-2/+5
| | * Fixed additional case differences between Gnupoc and Symbian^3.axis2010-07-3014-13/+38
* | | 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
| |\ \ \ \ \ \ \