summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-18223-2076/+2210
|\
| * Three fixes from Shane after QtMultimedia was split into two dlls.Espen Riskedal2010-04-167-1360/+1370
| * Fix compile errors in Direct Show media service.Andrew den Exter2010-04-162-2/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-16219-719/+843
| |\
| | * Add EXPORT defines for QtMediaServices library.Andrew den Exter2010-04-1627-41/+49
| | * Fixed configure check for gstreamer.Dmytro Poplavskiy2010-04-161-1/+1
| | * WebKit; build with change to mediaservices.Justin McPherson2010-04-161-3/+3
| | * QtMediaservices -> QtMediaServices.Justin McPherson2010-04-16121-565/+565
| | * configure; Fixes for changes to use mediaservices.Justin McPherson2010-04-161-2/+2
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-165-4/+4
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Kurt Korbatits2010-04-161-0/+0
| | | |\
| | | | * Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2dAndrew den Exter2010-04-161-0/+0
| | | * | Fixed compile errors in pulseaudio backend for soundeffectKurt Korbatits2010-04-161-1/+1
| | | |/
| | | * Fixed compile errors with gstreamer pluginKurt Korbatits2010-04-153-3/+3
| | * | Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-1647-191/+644
| | |\ \ | | | |/ | | |/|
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-15325-2722/+4871
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-152-24/+76
| | | |\ \
| | * | | | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-15214-650/+714
| | | |/ / | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-142-24/+76
| | |\ \ \
| | | * | | Gstreamer media backend: seek to media start on end of stream.Dmytro Poplavskiy2010-04-142-24/+76
* | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-1780-352/+891
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix mismatched import declarationsThiago Macieira2010-04-171-1/+1
| * | | | | 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