summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixed failure to store certain image formats as jpegaavit2010-03-051-1/+19
* Added QImage::bitPlaneCount().aavit2010-03-042-5/+51
* Finish to resolve merge conflict.Olivier Goffart2010-03-041-10/+11
* Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-0434-213/+107
|\
| * 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
* | | Fixes QMenu to only have static POD membersThierry Bastian2010-03-042-15/+15
* | | QScript: Test against QMetaType::QVariant instead of against the stringOlivier Goffart2010-03-042-28/+20
* | | Fixes tst_QScriptExtQObject::connectAndDisconnectOlivier Goffart2010-03-041-8/+6
* | | Fix source compatibility of qRegisterMetaTypeOlivier Goffart2010-03-031-14/+1
* | | Fix warnings on MSVCThierry Bastian2010-03-034-4/+5
* | | Updating documentation for how to build QWS with tslibJørgen Lind2010-03-032-4/+7
* | | sizeHint of checkbox/radiobutton without text is not correctThierry Bastian2010-03-033-3/+3
* | | Some cleanup of outdated src/3rdparty stuffaavit2010-03-0313-1106/+15
* | | Revert "Fixes crash when destroying a QGraphicsItem."Yoann Lopes2010-03-032-60/+2
* | | Add config.test for multimedia/qmlJørgen Lind2010-03-034-9/+79
* | | Fix QVariant autotestOlivier Goffart2010-03-031-3/+11
* | | Fix compilation of Q_DECLARE_METATYPE(QVariant) by introducing QMetaType::QVa...Olivier Goffart2010-03-033-3/+20
* | | fixed a memory leak when restoring a state in QMainWindowThierry Bastian2010-03-031-1/+4
* | | Make the sub-menu accessible via its shortcut even if it is the currentThierry Bastian2010-03-032-10/+22
* | | remove a warning on windows and simplify a bit the codeThierry Bastian2010-03-031-5/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-0310-10/+179
|\ \ \ | |/ / |/| |
| * | Add and use QGLContextPrivate::eglSurfaceForDevice()Tom Cooksey2010-03-024-4/+33
| * | QMetaType: Now we can register typedefs.Olivier Goffart2010-03-026-6/+146
* | | 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