summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-04-1680-351/+890
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-161-1/+4
| |\
| | * DocAaron Kennedy2010-04-161-1/+4
| |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-154-28/+111
| |\
| | * create magic comment messages in "finished" stateOswald Buddenhagen2010-04-152-3/+8
| | * make QT_TR_NOOP work in static initializersOswald Buddenhagen2010-04-153-6/+87
| | * make HashString and HashStringList objects smallerOswald Buddenhagen2010-04-151-13/+10
| | * remove pointless manual assignments from token type enumOswald Buddenhagen2010-04-151-6/+6
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-1536-46/+78
| |\ \ | | |/ | |/|
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Iain2010-04-155-25/+100
| | |\
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-1529-41/+40
| | | |\
| | * | | Update EABI and BWINS DEF files for SymbianIain2010-04-155-3/+35
| | * | | Update WebKit DEF files on SymbianIain2010-04-152-2/+3
| | | |/ | | |/|
| | * | Symbol visibility fixes for RVCT4 on SymbianIain2010-04-151-1/+1
| | * | Symbol visibility fixes for RVCT4 on SymbianIain2010-04-152-2/+2
| | * | Symbol visibility fixes for RVCT4 on SymbianIain2010-04-1526-38/+37
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-156-47/+102
| |\ \ \ | | |_|/ | |/| |
| | * | Add translation context to qsTr() benchmarkKent Hansen2010-04-151-4/+7
| | * | QtScript: Add autotest for enumeration of QMetaObject propertiesKent Hansen2010-04-151-0/+34
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-154-43/+61
| | |\ \
| | | * | QNAM HTTP: Pipelining changesMarkus Goetz2010-04-154-43/+61
| * | | | 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