summaryrefslogtreecommitdiffstats
path: root/src
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-23197-2022/+2140
|\
| * Remove trace code from directshowaudioendpointcontrol.h.Andrew den Exter2010-04-231-5/+0
| * Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-2275-537/+898
| |\
| * | Multimedia causes build failure when Qt is configured with -embeddedKurt Korbatits2010-04-211-1/+19
| * | Gstreamer media backend: preserve playback rate after seeks and mediaDmytro Poplavskiy2010-04-211-4/+15
| * | QT7 mediaservice; fix leaking strings.Justin McPherson2010-04-201-8/+7
| * | Fixed Qt build with mediaservices disabled.Dmytro Poplavskiy2010-04-201-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-19196-2003/+2098
| |\ \
| | * | Disabled QMediaPlayer states debug output.Dmytro Poplavskiy2010-04-191-1/+1
| | * | Fixed typo in QMediaPlayer::play() error reportingDmytro Poplavskiy2010-04-191-3/+3
| | * | Fix warning about illegal empty declaration.Andrew den Exter2010-04-191-1/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-18196-2000/+2095
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-18196-2000/+2095
| | | |\ \
| | | | * | 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-16192-643/+728
| | | | |\ \
| | | | | * | Add EXPORT defines for QtMediaServices library.Andrew den Exter2010-04-1627-41/+49
| | | | | * | WebKit; build with change to mediaservices.Justin McPherson2010-04-161-3/+3
| | | | | * | QtMediaservices -> QtMediaServices.Justin McPherson2010-04-16114-548/+548
| | | | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-164-4/+4
| | | | | |\ \
| | | | | | * | 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-1630-132/+380
| | | | | |\ \ \ | | | | | | |/ / | | | | | |/| |
| | | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-1553-235/+845
| | | | | |\ \ \
| | | | | | * \ \ 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-15188-575/+600
| | | | | | |/ / / | | | | | |/| | |
| | | | | * | | | 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/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-231-1/+27
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-221-1/+27
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | QtWebkit WINS DEF file freezeJanne Koskinen2010-04-221-1/+27
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-2324-974/+378
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Try to use multisampled opengl graphicssystem on all platformsTom Cooksey2010-04-221-0/+1
| * | | | | | | | | | | Make sure recreateEglSurface creates a surface if there isn't oneTom Cooksey2010-04-223-14/+14
| * | | | | | | | | | | QX11GL: Implement QX11GLWindowSurface::grabWidgetTom Cooksey2010-04-222-0/+47
| * | | | | | | | | | | QX11GL: Cleanup the window surface & remove some synchronisationTom Cooksey2010-04-222-53/+47
| * | | | | | | | | | | QX11GL: Move the shared context ownership into a seperate classTom Cooksey2010-04-223-101/+148
| * | | | | | | | | | | QX11GL: Don't do glFinish in endPaintTom Cooksey2010-04-222-7/+0
| * | | | | | | | | | | Implement QGLPaintDevice::metric()Tom Cooksey2010-04-222-0/+17
| * | | | | | | | | | | Remove dead code left after a merge conflict resolutionTom Cooksey2010-04-222-22/+0
| * | | | | | | | | | | Fixed autotest failures in tst_QPainterPath.Samuel Rødal2010-04-221-7/+2
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-2210-778/+110
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Removed bezier intersection code in path clipper.Samuel Rødal2010-04-227-775/+98
| | * | | | | | | | | | When using Qt::BypassGraphicsProxyWidget with QMenu the application is not st...Alexis Menard2010-04-223-3/+12
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2351-437/+665
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add missing Q_DISABLE_COPYs.Michael Brasser2010-04-225-0/+8
| * | | | | | | | | | | | Use Q_DECLARE_PRIVATE for private slot.Michael Brasser2010-04-223-7/+7
| * | | | | | | | | | | | Workaround no longer needed.Michael Brasser2010-04-221-3/+1
| * | | | | | | | | | | | Rename QDeclarativeExpression::value() to evaluate().Michael Brasser2010-04-2211-35/+36
| * | | | | | | | | | | | Continue to register base type.Michael Brasser2010-04-221-0/+1