summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-155-25/+100
|\
| * Fixes auto-test failure for 9da13ea53aec6d841ba7f416531d6c52d4368df4.Yoann Lopes2010-04-151-19/+0
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-155-24/+118
| |\
| | * Fixes tooltips for QGraphicsProxyWidget.Yoann Lopes2010-04-155-24/+118
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-154-26/+47
|\ \ \ | |/ / |/| |
| * | '#' gets inserted to editor when changing FEP modesSami Merila2010-04-151-1/+0
| * | ComboBox popuplist is not correctly layouted in fullscreen modeSami Merila2010-04-151-7/+21
| * | Dialogs in landscape mode are not correctly positionedSami Merila2010-04-151-17/+24
| * | Slider graphics does not look correct in N95 (part2)Sami Merila2010-04-151-1/+2
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-151-0/+1
|\ \ \ | |/ /
| * | Slider graphics does not look correct in N95Sami Merila2010-04-151-0/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-1513-122/+192
|\ \ \ | |/ /
| * | Fixed compiler warningGareth Stockwell2010-04-151-2/+2
| * | Phonon MMF: fixed crash during opening of video clipGareth Stockwell2010-04-152-57/+58
| * | Phonon MMF: ensure initial volume is appliedGareth Stockwell2010-04-151-3/+2
| * | Phonon MMF: fix state changes emitted during playlist handlingGareth Stockwell2010-04-151-0/+5
| * | Phonon MMF: calling pause() when in StoppedState triggers stateChanged()Gareth Stockwell2010-04-157-30/+72
| * | Phonon MMF: change to PausedState, not StoppedState when finishedGareth Stockwell2010-04-151-1/+1
| * | Phonon MMF: Suppress intermediate stateChanged() signalGareth Stockwell2010-04-152-8/+16
| * | Phonon MMF: Emit tick() signalGareth Stockwell2010-04-151-0/+1
| * | Phonon MMF: Emit prefinishMarkReached(), finished() signalsGareth Stockwell2010-04-153-2/+18
| * | Phonon MMF: Removed compiler warningGareth Stockwell2010-04-151-1/+1
| * | tst_mediaobject: ensure MediaObject is in StoppedState before each stepGareth Stockwell2010-04-151-0/+7
| * | tst_mediaobject: Removed non-portable escape codes from outputGareth Stockwell2010-04-151-8/+2
| * | tst_mediaobject: Ensure playSDP step cleanup is runGareth Stockwell2010-04-151-5/+10
| * | tst_mediaobject: Removed compiler warningsGareth Stockwell2010-04-152-4/+2
| * | tst_mediaobject: Removed compiler warningsGareth Stockwell2010-04-151-6/+0
|/ /
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-141-1/+1
|\ \
| * | Phonon MMF: fixed typo in trace statementGareth Stockwell2010-04-141-1/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-1411-3/+117
|\ \ \ | |_|/ |/| |
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-04-145-2/+25
| * | QtScript: Add tests for translation of multiple scriptsKent Hansen2010-04-144-0/+81
| * | QtScript: Add test for translation disambiguationKent Hansen2010-04-144-0/+10
| * | QtScript: Fix call stack issue with qsTr() when JIT is enabledKent Hansen2010-04-141-1/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-144-50/+195
|\ \ \ | |/ / |/| |
| * | merge commit c638ddc70f6a8196f2c8b11808ab01510233a0ee from harfbuzz:Lars Knoll2010-04-144-50/+195
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-141-0/+1
|\ \ \ | |_|/ |/| |
| * | Fix autotest failure: QIODevice::read() on a closed device must return -1Thiago Macieira2010-04-141-0/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-147-23/+75
|\ \ \ | |_|/ |/| |
| * | QS60Style: HouseKeeping taskSami Merila2010-04-141-10/+9
| * | QS60Style: In a very short combobox, text is cutSami Merila2010-04-141-9/+10
| * | QS60Style: Sometimes progressbars do not animateSami Merila2010-04-141-2/+4
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-146-2/+52
| |\ \
| | * | Implement OpenVG buffer scrolling and enable it on Symbian.Jason Barron2010-04-146-2/+52
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-143-9/+23
|\ \ \ \
| * | | | QAbstractScrollArea StyleSheet: fix drawing of border with SH_ScrollView_Fram...Olivier Goffart2010-04-143-9/+23
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-143-2/+50
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | Improve test coverage of QtScript translation functionsKent Hansen2010-04-142-2/+44
| * | | QFtp: Fix possible crashMarkus Goetz2010-04-141-0/+6
|/ / /
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-1314-8/+133
|\ \ \