summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix attempted invocation of non-existent timerActivated() slot.Andrew den Exter2010-04-271-2/+2
* Fix up qdocs for mediaservices namespace.Kurt Korbatits2010-04-271-9/+9
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-275-3/+136
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-265-3/+136
| |\
| | * fix nmake build with win32-msvc2010Joerg Bornemann2010-04-263-3/+3
| | * Added mkspec for MSVC 2010Martin Petersson2010-04-262-0/+133
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-2611-40/+28
|\ \ \
| * | | add translator commentOswald Buddenhagen2010-04-261-0/+3
| * | | save a QFile::encodeName()Oswald Buddenhagen2010-04-261-3/+3
| * | | Don't use QList's begin() and end() where possible.Robin Burchell2010-04-261-2/+2
| * | | Ensure we stop the name lookups in QAbstractSocket if we abort().Thiago Macieira2010-04-261-0/+4
| * | | Don't rely on tryStart() to do job control.Thiago Macieira2010-04-261-4/+2
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-261508-7802/+22130
| |\ \ \
| | * | | Improved workaround for new qt documentation, base on dboddie's work.kh12010-04-263-13/+12
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-233-16/+42
| |\ \ \ \
| * | | | | Doc: Fixed typos.David Boddie2010-04-232-2/+2
| * | | | | Ensure that all qthelp URLs have paths that start with /qdoc/.David Boddie2010-04-232-6/+5
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-2252-209/+489
| |\ \ \ \ \
| * | | | | | Doc: Fixed the Declarative documentation set. Tweaked the others.David Boddie2010-04-225-26/+44
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-2613-75/+121
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | DEF file updates for BWINS and EABI for SymbianIain2010-04-2610-54/+119
| * | | | | | Fix typoThomas Zander2010-04-261-1/+1
| * | | | | | Revert "Add QML imports to s60installs.pro"Thomas Zander2010-04-261-19/+0
| * | | | | | Assigned a UID3 to qml.exe.Frans Englich2010-04-261-1/+1
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-266-27/+48
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Remove stray qDebugTom Cooksey2010-04-261-1/+0
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-265-26/+48
| |\ \ \ \ \ \
| | * | | | | | Don't leak objects if QX11GLSharedContexts is instanciated twiceTom Cooksey2010-04-261-3/+6
| | * | | | | | Enable QX11GLWindowSurface using "-graphicssystem x11gl" optionTom Cooksey2010-04-265-23/+37
| | * | | | | | Force full-screen updates for QGLWindowSurfaceTom Cooksey2010-04-261-1/+6
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-261-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Doc: correcting a character bug in the footer.Morten Engvoldsen2010-04-261-1/+1
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-24259-2240/+7509
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix all qmake Makefiles to include the MSBuild backendMarius Storm-Olsen2010-04-244-8/+26
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-24256-2234/+7485
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-24256-2234/+7485
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-23256-2234/+7485
| | |\ \ \ \ \ \
| | | * | | | | | Remove trace code from directshowaudioendpointcontrol.h.Andrew den Exter2010-04-231-5/+0
| | | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-2319-17/+5099
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-21256-2226/+7481
| | | | |\ \ \ \ \ \
| | | | | * | | | | | New configure.exe binaryMarius Storm-Olsen2010-04-211-0/+0
| | | | | * | | | | | Add support for MSBuild, which is the project format for MSVC 2010Martin Petersson2010-04-2118-17/+5099
| | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-21239-2209/+2382
| | | | | |\ \ \ \ \ \
| | | * | | \ \ \ \ \ \ Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-22125-1142/+2287
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Only add qvideowidget test once.Justin McPherson2010-04-211-2/+1
| | | * | | | | | | | | Multimedia causes build failure when Qt is configured with -embeddedKurt Korbatits2010-04-211-1/+19
| | | * | | | | | | | | Player demo: load not only local files but playlists and urls passed asDmytro Poplavskiy2010-04-211-5/+16
| | | * | | | | | | | | 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-202-3/+2