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-19237-2187/+2323
|\
| * Disabled QMediaPlayer states debug output.Dmytro Poplavskiy2010-04-191-1/+1
| * Fixed typo in QMediaPlayer::play() error reportingDmytro Poplavskiy2010-04-191-3/+3
| * Fixed QVideoWidget test, waiting for video surface painted.Dmytro Poplavskiy2010-04-191-1/+3
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-191-1/+1
| |\
| | * Fix warning about illegal empty declaration.Andrew den Exter2010-04-191-1/+1
| * | Tests; Fix media tests, make sure they are using mediaservies.Justin McPherson2010-04-1917-110/+110
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-18223-2076/+2210
| |\
| | * 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 '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1915-128/+147
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1815-128/+147
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1715-128/+147
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | Some QWindowSurface implementations might implement flush as a bufferBjørn Erik Nilsen2010-04-165-24/+128
| | | * | | | | | | Set EGL_SWAP_BEHAVIOR to EGL_BUFFER_PRESERVED for regular QWidgetsTom Cooksey2010-04-162-0/+7
| | | * | | | | | | Cleanup & remove unused function overloads from QEgl* APIsTom Cooksey2010-04-168-102/+10
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-161-2/+2
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | | * | | | | | QScrollArea: Excessive scrolling in focusNextPrevChild()Gabriel de Dietrich2010-04-161-2/+2
| | | | | |_|_|_|/ | | | | |/| | | |
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-19144-2114/+24577
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-18144-2114/+24577
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-17144-2114/+24577
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Autotest: increase wait time to 3s on Windows to bypass 2s-granularity limita...Thiago Macieira2010-04-171-1/+1
| | | * | | | | | Autotest: update to the new values for the localeThiago Macieira2010-04-171-3/+3
| | | * | | | | | do not expand variables in read()'s file nameOswald Buddenhagen2010-04-161-2/+1
| | | * | | | | | remove ability to use break() a block outside any loopOswald Buddenhagen2010-04-161-2/+0
| | | * | | | | | don't add -unix to the qmake command lineOswald Buddenhagen2010-04-161-1/+0
| | | * | | | | | Increase the timeout for the QNAM getter test to 30 secondsThiago Macieira2010-04-161-3/+3
| | | * | | | | | Remove unstable hosts from the listThiago Macieira2010-04-161-2/+0
| | | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-1618-429/+20214
| | | |\ \ \ \ \ \
| | | | * | | | | | Other fixes to the remote network stresstesterThiago Macieira2010-04-161-8/+7
| | | | * | | | | | Fix SSL connection problem.Thiago Macieira2010-04-161-4/+6
| | | | * | | | | | Make sure we don't try URLs that aren't HTTP or HTTPSThiago Macieira2010-04-161-3/+5