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-03-049-22/+188
|\
| * WaveDecoder; be more permissive in handling of wave file formats.Justin McPherson2010-03-042-6/+16
| * Debug media player status and media state changes.Dmytro Poplavskiy2010-03-041-1/+17
| * Added playlist playback modes combo box to player demoDmytro Poplavskiy2010-03-042-1/+30
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-043-6/+6
| |\
| * | Added QMediaPlayer::StreamPlayback flag to query/select backend capableDmytro Poplavskiy2010-03-045-14/+125
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-0434-211/+107
|\ \ \ | | |/ | |/|
| * | Fix namespace qml decleration.Justin McPherson2010-03-041-2/+1
| * | Cocoa namespace fixes.Justin McPherson2010-03-041-1/+1
| * | Namespace fixes.Justin McPherson2010-03-041-3/+4
| |/
| * QT7 mediaservice; Fix memory leakJustin McPherson2010-03-031-0/+1
| * Undo a doc revert.Justin McPherson2010-03-031-1/+1
| * Remove dependency on declarative from multimedia.Justin McPherson2010-03-0330-206/+101
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-039-74/+230
|\ \ | |/
| * Fixed compile of some tests with `-qtnamespace'Rohan McGovern2010-03-032-0/+11
| * Gstreamer media backend: ensure the null video output is not deletedDmytro Poplavskiy2010-03-031-0/+2
| * Use mute property instead of setting volume to 0 if playbin2 is used.Dmytro Poplavskiy2010-03-031-8/+20
| * Gstreamer playback backend: Start loading media on setMedia(),Dmytro Poplavskiy2010-03-034-59/+186
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-033-7/+11
| |\ |/ /
| * Fixed compiler warnings when compiling multimedia module.Kurt Korbatits2010-03-033-7/+11
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-0226-657/+986
|\ \
| * | Fix & move QEgl::native* to platform-specific filesTom Cooksey2010-03-025-20/+49
| * | Updates to changes fileaavit2010-03-021-0/+6
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-0225-656/+950
| |\ \ |/ / /
| * | Make bindTextureFromNativePixmap use new QEgl APIsTom Cooksey2010-03-026-20/+39
| * | Move QGLWidget::setContext logic into QEgl & QGLContextTom Cooksey2010-03-026-131/+180
| * | Move EGL surface type setting to new QEglProperties::setDeviceTypeTom Cooksey2010-03-028-41/+53
| * | Replace qt_egl_add_platform_config with existing QEglProperties APITom Cooksey2010-03-024-35/+3
| * | Use QEgl::display in QGLTemporaryContext so EGL is init'd only onceTom Cooksey2010-03-021-6/+1
| * | Remove qt_egl_setup_x11_visualTom Cooksey2010-03-021-149/+1
| * | Make QGLWidget use new QEgl::getCompatibleVisualId APITom Cooksey2010-03-022-5/+18
| * | Add QEglContext::configAttrib(int name) helperTom Cooksey2010-03-022-0/+11
| * | Add getCompatibleVisualId to QEgl on X11Tom Cooksey2010-03-022-0/+149
| * | Add QEgl::defaultConfig method to select configs suitable for QtTom Cooksey2010-03-023-0/+188
| * | Make QEgl::createSurface cross-platform and add native gettersTom Cooksey2010-03-026-123/+57
| * | Move chooseConfig and createSurface logic to QEgl functionsTom Cooksey2010-03-026-12/+28
| * | Move static methods from QEglContext to QEgl namespaceTom Cooksey2010-03-0210-88/+97
| * | Move qegl_p.h -> qeglcontext_p.h and add a new qegl_p.hTom Cooksey2010-03-0218-117/+196
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-029-38/+81
|\ \ \
| * | | doc: Fixed some qdoc errors.Martin Smith2010-03-022-2/+2
| * | | qdoc: Second attempt, QML doc stuff.Martin Smith2010-03-027-36/+79
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-0222-302/+730
|\ \ \ | |/ / |/| |
| * | Merge remote branch 'staging/4.7' into HEADAaron McCarthy2010-03-022627-143654/+170820
| |\ \
| * | | Bearer management changes from Qt Mobility (fca9891).Aaron McCarthy2010-03-0223-369/+794
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-015-32/+60
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-015-32/+60
| |\ \ \
| | * | | removed dead codeThierry Bastian2010-03-011-21/+12
| | * | | QMetaObject::invokeMethod: print a warning if the method is not found.Olivier Goffart2010-03-013-8/+38
| | * | | Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.Trond Kjernåsen2010-03-011-3/+10
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-0121-61/+152
|\ \ \ \ \ | |/ / / / |/| | | |