Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-23 | 197 | -2022/+2140 |
|\ | |||||
| * | Remove trace code from directshowaudioendpointcontrol.h. | Andrew den Exter | 2010-04-23 | 1 | -5/+0 |
| * | Merge branch '4.7' of ../../qt/4.7 into 4.7 | Justin McPherson | 2010-04-22 | 75 | -537/+898 |
| |\ | |||||
| * | | Multimedia causes build failure when Qt is configured with -embedded | Kurt Korbatits | 2010-04-21 | 1 | -1/+19 |
| * | | Gstreamer media backend: preserve playback rate after seeks and media | Dmytro Poplavskiy | 2010-04-21 | 1 | -4/+15 |
| * | | QT7 mediaservice; fix leaking strings. | Justin McPherson | 2010-04-20 | 1 | -8/+7 |
| * | | Fixed Qt build with mediaservices disabled. | Dmytro Poplavskiy | 2010-04-20 | 1 | -1/+1 |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-19 | 196 | -2003/+2098 |
| |\ \ | |||||
| | * | | Disabled QMediaPlayer states debug output. | Dmytro Poplavskiy | 2010-04-19 | 1 | -1/+1 |
| | * | | Fixed typo in QMediaPlayer::play() error reporting | Dmytro Poplavskiy | 2010-04-19 | 1 | -3/+3 |
| | * | | Fix warning about illegal empty declaration. | Andrew den Exter | 2010-04-19 | 1 | -1/+1 |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-18 | 196 | -2000/+2095 |
| | |\ \ | |||||
| | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-18 | 196 | -2000/+2095 |
| | | |\ \ | |||||
| | | | * | | Three fixes from Shane after QtMultimedia was split into two dlls. | Espen Riskedal | 2010-04-16 | 7 | -1360/+1370 |
| | | | * | | Fix compile errors in Direct Show media service. | Andrew den Exter | 2010-04-16 | 2 | -2/+2 |
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-16 | 192 | -643/+728 |
| | | | |\ \ | |||||
| | | | | * | | Add EXPORT defines for QtMediaServices library. | Andrew den Exter | 2010-04-16 | 27 | -41/+49 |
| | | | | * | | WebKit; build with change to mediaservices. | Justin McPherson | 2010-04-16 | 1 | -3/+3 |
| | | | | * | | QtMediaservices -> QtMediaServices. | Justin McPherson | 2010-04-16 | 114 | -548/+548 |
| | | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int... | Justin McPherson | 2010-04-16 | 4 | -4/+4 |
| | | | | |\ \ | |||||
| | | | | | * | | Fixed compile errors in pulseaudio backend for soundeffect | Kurt Korbatits | 2010-04-16 | 1 | -1/+1 |
| | | | | | * | | Fixed compile errors with gstreamer plugin | Kurt Korbatits | 2010-04-15 | 3 | -3/+3 |
| | | | | * | | | Merge branch '4.7' of ../../qt/4.7 into 4.7 | Justin McPherson | 2010-04-16 | 30 | -132/+380 |
| | | | | |\ \ \ | | | | | | |/ / | | | | | |/| | | |||||
| | | | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int... | Justin McPherson | 2010-04-15 | 53 | -235/+845 |
| | | | | |\ \ \ | |||||
| | | | | | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-15 | 2 | -24/+76 |
| | | | | | |\ \ \ | |||||
| | | | | * | | | | | Create Mediaservices lib, separate from Multimedia. | Justin McPherson | 2010-04-15 | 188 | -575/+600 |
| | | | | | |/ / / | | | | | |/| | | | |||||
| | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-14 | 2 | -24/+76 |
| | | | | |\ \ \ \ | |||||
| | | | | | * | | | | Gstreamer media backend: seek to media start on end of stream. | Dmytro Poplavskiy | 2010-04-14 | 2 | -24/+76 |
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration | Qt Continuous Integration System | 2010-04-23 | 1 | -1/+27 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration | Qt Continuous Integration System | 2010-04-22 | 1 | -1/+27 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| | * | | | | | | | | | QtWebkit WINS DEF file freeze | Janne Koskinen | 2010-04-22 | 1 | -1/+27 |
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-04-23 | 24 | -974/+378 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Try to use multisampled opengl graphicssystem on all platforms | Tom Cooksey | 2010-04-22 | 1 | -0/+1 |
| * | | | | | | | | | | | Make sure recreateEglSurface creates a surface if there isn't one | Tom Cooksey | 2010-04-22 | 3 | -14/+14 |
| * | | | | | | | | | | | QX11GL: Implement QX11GLWindowSurface::grabWidget | Tom Cooksey | 2010-04-22 | 2 | -0/+47 |
| * | | | | | | | | | | | QX11GL: Cleanup the window surface & remove some synchronisation | Tom Cooksey | 2010-04-22 | 2 | -53/+47 |
| * | | | | | | | | | | | QX11GL: Move the shared context ownership into a seperate class | Tom Cooksey | 2010-04-22 | 3 | -101/+148 |
| * | | | | | | | | | | | QX11GL: Don't do glFinish in endPaint | Tom Cooksey | 2010-04-22 | 2 | -7/+0 |
| * | | | | | | | | | | | Implement QGLPaintDevice::metric() | Tom Cooksey | 2010-04-22 | 2 | -0/+17 |
| * | | | | | | | | | | | Remove dead code left after a merge conflict resolution | Tom Cooksey | 2010-04-22 | 2 | -22/+0 |
| * | | | | | | | | | | | Fixed autotest failures in tst_QPainterPath. | Samuel Rødal | 2010-04-22 | 1 | -7/+2 |
| * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-04-22 | 10 | -778/+110 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Removed bezier intersection code in path clipper. | Samuel Rødal | 2010-04-22 | 7 | -775/+98 |
| | * | | | | | | | | | | When using Qt::BypassGraphicsProxyWidget with QMenu the application is not st... | Alexis Menard | 2010-04-22 | 3 | -3/+12 |
* | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-23 | 51 | -437/+665 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Add missing Q_DISABLE_COPYs. | Michael Brasser | 2010-04-22 | 5 | -0/+8 |
| * | | | | | | | | | | | | Use Q_DECLARE_PRIVATE for private slot. | Michael Brasser | 2010-04-22 | 3 | -7/+7 |
| * | | | | | | | | | | | | Workaround no longer needed. | Michael Brasser | 2010-04-22 | 1 | -3/+1 |
| * | | | | | | | | | | | | Rename QDeclarativeExpression::value() to evaluate(). | Michael Brasser | 2010-04-22 | 11 | -35/+36 |
| * | | | | | | | | | | | | Continue to register base type. | Michael Brasser | 2010-04-22 | 1 | -0/+1 |