summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make the Direct Show media service compile with mingw.Andrew den Exter2010-02-2510-45/+152
* Test for the existance of the Windows Media SDK in configure.Andrew den Exter2010-02-252-2/+11
* Remove all uses of __uuidof from the Direct Show media service.Andrew den Exter2010-02-2510-51/+59
* QT7; Add support for setting cookies when loading a movie.Justin McPherson2010-02-251-4/+27
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2432-62/+181
|\
| * QMediaContent test; make sure to use network.Justin McPherson2010-02-241-1/+1
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2431-61/+180
| |\
| | * Rebuild configure.exeAndrew den Exter2010-02-241-0/+0
| | * Add -mediaservice argument to configure.Andrew den Exter2010-02-244-14/+43
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2326-47/+137
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2326-47/+137
| | | |\
| | | | * Remove active qDebugs.Justin McPherson2010-02-2312-42/+38
| | | | * Player demo updated with more user-friendly previous button behaviour.Nicholas Young2010-02-232-1/+13
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-stagingNicholas Young2010-02-2318-28/+212
| | | | |\
| | | | | * Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.Justin McPherson2010-02-234-4/+4
| | | | | * Add private header warning.Justin McPherson2010-02-235-0/+54
| | | | * | Added QNetworkRequest constructor to QMediaContent.Nicholas Young2010-02-233-0/+28
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-241-2/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | compile fix with namespaces after a broken automatical mergehjk2010-02-241-2/+0
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-24131-117/+23094
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Make this function non-static.Aaron McCarthy2010-02-231-1/+1
| * | | | | Merge remote branch 'staging/master' into bearermanagement/stagingAaron McCarthy2010-02-23127-2086/+2417
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-23131-117/+23094
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge remote branch 'origin/master' into bearermanagement/stagingAaron McCarthy2010-02-232-1/+15
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'origin/master' into bearermanagement/stagingAaron McCarthy2010-02-23277-2687/+2419
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Make compile on Maemo6.Aaron McCarthy2010-02-233-9/+16
| * | | | | | | | Merge remote branch 'staging/master' into bearermanagement/unit-testsAaron McCarthy2010-02-2315-28/+158
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-22131-117/+23077
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Fix build on Symbian.Aaron McCarthy2010-02-233-2/+12
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Change initialization order.Aaron McCarthy2010-02-221-1/+1
| * | | | | | | | Merge remote branch 'staging/master' into bearermanagement/unit-testsAaron McCarthy2010-02-221-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixed qnetworksession test on Mac.Rohan McGovern2010-02-211-0/+1
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-21129-115/+22880
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-21129-115/+22880
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-20129-115/+22880
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-20129-115/+22880
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-20129-115/+22880
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ Merge remote branch 'origin/master' into mobility-masterRohan McGovern2010-02-191227-17914/+115112
| | | | | | | |\ \ \ \ \ \ \
| * | | | | | | | | | | | | | Increase try verify timeout.Aaron McCarthy2010-02-222-2/+2
| * | | | | | | | | | | | | | Add locking to bearer code.Aaron McCarthy2010-02-2214-103/+297
| * | | | | | | | | | | | | | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-221980-72198/+158783
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | / / / / / / / / | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Create unit-test in parent directory.Aaron McCarthy2010-02-193-1/+12
| * | | | | | | | | | | | | Allow QNAM to be created as a global variable.Aaron McCarthy2010-02-182-3/+9
| * | | | | | | | | | | | | Don't load NetworkManager plugin in NetworkManager is not available.Aaron McCarthy2010-02-184-6/+20
| * | | | | | | | | | | | | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-1758-388/+703
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Disable NLA plugin, build generic on win32 and mac.Aaron McCarthy2010-02-171-1/+3
| * | | | | | | | | | | | | | Fix QNetworkSession unit test.Aaron McCarthy2010-02-163-10/+14
| * | | | | | | | | | | | | | Fix segfault.Aaron McCarthy2010-02-161-14/+17
| * | | | | | | | | | | | | | Remove debug output.Aaron McCarthy2010-02-161-4/+4
| * | | | | | | | | | | | | | Make this a warning.Aaron McCarthy2010-02-161-2/+2