summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Fixed test regression on MacGareth Stockwell2010-08-031-0/+5
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-08-0313-26/+124
| |\ |/ /
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-08-0313-26/+124
| |\
| | * Fixed build break on Symbian versions earlier than S^3Gareth Stockwell2010-08-021-1/+1
| | * Enabled tst_mediaobject::testPlayFromResource on SymbianGareth Stockwell2010-08-021-18/+2
| | * Added support to Phonon MMF backend for playback of Qt resource filesGareth Stockwell2010-08-023-9/+9
| | * Updated tst_mediaobject resource playback test casesGareth Stockwell2010-08-021-6/+17
| | * Added support to Phonon MMF backend for playback of Qt resource filesGareth Stockwell2010-08-0212-20/+123
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-08-031-0/+4
|\ \ \ | |/ / |/| |
| * | Don't resolve GLSL extensions if no shadersRhys Weatherley2010-08-031-0/+4
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-08-031-1/+1
|\ \ \ | |/ /
| * | setUniformValue(QSize) was setting (w,w) not (w,h)Rhys Weatherley2010-08-031-1/+1
|/ /
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-07-301-3/+13
|\ \ | |/
| * Fix proxy widgets with the OpenVG paint engine.Jason Barron2010-07-301-3/+13
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-07-293-21/+35
|\ \ | |/
| * Ensure that window rectangle is updated when CBA visibility changesGareth Stockwell2010-07-283-21/+33
| * Clear Qt::WA_OutsideWSRange when making window fullscreenGareth Stockwell2010-07-281-0/+2
|/
* 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-272-1/+57
|\ \ \ | |/ / |/| |
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-07-272-1/+57
| |\ \ |/ / /
| * | Fix crash when all the items in a QListView are hiddenGabriel de Dietrich2010-07-272-1/+57
| |/
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-07-271-1/+4
|\ \ | |/ |/|
| * Workaround for QTBUG-8013: Do not return an ascent of 0Alessandro Portale2010-07-271-1/+4
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-07-262-3/+5
|\ \ | |/
| * Removed QEXPECT_FAIL macros from test cases which now passGareth Stockwell2010-07-261-3/+1
| * Ensure backing store is deleted before top-level windowGareth Stockwell2010-07-261-0/+4
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-07-224-4/+4
|\
| * One more .pro fix for deprecated INCPATHMarkus Goetz2010-07-221-1/+1
| * Fix Rhys' qmake warningsMarkus Goetz2010-07-223-3/+3
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-07-222-3/+26
|\
| * Fixed QVideoSurfaceFormat::isValid()Dmytro Poplavskiy2010-07-222-3/+26
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-07-2014-1517/+2
|\
| * Revert "Add the chart utility from qtestlib-tools."Rohan McGovern2010-07-2014-1517/+2
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-07-197-96/+0
|\ \ | |/
| * Remove references to files removed by previous commit.Jason McDonald2010-07-192-8/+0
| * Remove files as instructed by Legal department.Jason McDonald2010-07-196-88/+0
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-07-161-1/+1
|\ \ | |/
| * Fixed some network tests never being run.Rohan McGovern2010-07-161-1/+1
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-07-151-0/+5
|\
| * Remove test cases which cause stack overflowShane Kearns2010-07-151-0/+5
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-07-151-1/+4
|\ \ | |/
| * Avoid a crash in the OpenVG paint engine when clipping to an empty pathJason Barron2010-07-151-1/+4
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-07-134-2/+27
|\
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-07-134-2/+27
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-07-131-0/+4
|\ \
| * | Fix last character being overwritten in password fieldShane Kearns2010-07-131-0/+4
|/ /
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-07-131-1/+13
|\ \ | |/
| * QSslSocket: Improve error handlingPeter Hartmann2010-07-131-1/+13