summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* More QDeclarativeNetworkAccessManagerFactory doc clarification.Martin Jones2010-04-271-1/+3
* Fix QDeclarativeNetworkAccessManagerFactory docs.Martin Jones2010-04-271-4/+1
* Don't crash on invalid model remove signal.Martin Jones2010-04-271-4/+9
* Fix remaining 4.6 type registrations (to 4.7).Warwick Allison2010-04-271-2/+2
* doc anchor margins vs. anchor (line) state/animation.Warwick Allison2010-04-262-2/+10
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-266-61/+213
|\
| * Improved error messages for type resolving, new debug optionmae2010-04-263-55/+133
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-243-6/+80
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-243-6/+80
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-243-6/+80
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-233-6/+80
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-2326-102/+167
| | | | | |\
| | | | | | * Return null if creation fails.Michael Brasser2010-04-231-3/+5
| | | | | | * Basic Component doc.Michael Brasser2010-04-231-1/+74
| | | | | * | no export in pluginWarwick Allison2010-04-231-1/+1
| | | | | * | compileWarwick Allison2010-04-221-2/+1
* | | | | | | 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/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-24197-2022/+2140
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-24197-2022/+2140
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | 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
| | | | | | | |\ \ \ \ \ \ \