Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make the Direct Show media service compile with mingw. | Andrew den Exter | 2010-02-25 | 10 | -45/+152 |
* | Test for the existance of the Windows Media SDK in configure. | Andrew den Exter | 2010-02-25 | 2 | -2/+11 |
* | Remove all uses of __uuidof from the Direct Show media service. | Andrew den Exter | 2010-02-25 | 10 | -51/+59 |
* | QT7; Add support for setting cookies when loading a movie. | Justin McPherson | 2010-02-25 | 1 | -4/+27 |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-24 | 32 | -62/+181 |
|\ | |||||
| * | QMediaContent test; make sure to use network. | Justin McPherson | 2010-02-24 | 1 | -1/+1 |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-24 | 31 | -61/+180 |
| |\ | |||||
| | * | Rebuild configure.exe | Andrew den Exter | 2010-02-24 | 1 | -0/+0 |
| | * | Add -mediaservice argument to configure. | Andrew den Exter | 2010-02-24 | 4 | -14/+43 |
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-23 | 26 | -47/+137 |
| | |\ | |||||
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-23 | 26 | -47/+137 |
| | | |\ | |||||
| | | | * | Remove active qDebugs. | Justin McPherson | 2010-02-23 | 12 | -42/+38 |
| | | | * | Player demo updated with more user-friendly previous button behaviour. | Nicholas Young | 2010-02-23 | 2 | -1/+13 |
| | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging | Nicholas Young | 2010-02-23 | 18 | -28/+212 |
| | | | |\ | |||||
| | | | | * | Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. | Justin McPherson | 2010-02-23 | 4 | -4/+4 |
| | | | | * | Add private header warning. | Justin McPherson | 2010-02-23 | 5 | -0/+54 |
| | | | * | | Added QNetworkRequest constructor to QMediaContent. | Nicholas Young | 2010-02-23 | 3 | -0/+28 |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast... | Qt Continuous Integration System | 2010-02-24 | 1 | -2/+0 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | compile fix with namespaces after a broken automatical merge | hjk | 2010-02-24 | 1 | -2/+0 |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-24 | 131 | -117/+23094 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Make this function non-static. | Aaron McCarthy | 2010-02-23 | 1 | -1/+1 |
| * | | | | | Merge remote branch 'staging/master' into bearermanagement/staging | Aaron McCarthy | 2010-02-23 | 127 | -2086/+2417 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-23 | 131 | -117/+23094 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Merge remote branch 'origin/master' into bearermanagement/staging | Aaron McCarthy | 2010-02-23 | 2 | -1/+15 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote branch 'origin/master' into bearermanagement/staging | Aaron McCarthy | 2010-02-23 | 277 | -2687/+2419 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Make compile on Maemo6. | Aaron McCarthy | 2010-02-23 | 3 | -9/+16 |
| * | | | | | | | | Merge remote branch 'staging/master' into bearermanagement/unit-tests | Aaron McCarthy | 2010-02-23 | 15 | -28/+158 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-22 | 131 | -117/+23077 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * | | | | | | | | | Fix build on Symbian. | Aaron McCarthy | 2010-02-23 | 3 | -2/+12 |
| | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Change initialization order. | Aaron McCarthy | 2010-02-22 | 1 | -1/+1 |
| * | | | | | | | | Merge remote branch 'staging/master' into bearermanagement/unit-tests | Aaron McCarthy | 2010-02-22 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fixed qnetworksession test on Mac. | Rohan McGovern | 2010-02-21 | 1 | -0/+1 |
| | * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-21 | 129 | -115/+22880 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-21 | 129 | -115/+22880 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-20 | 129 | -115/+22880 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-20 | 129 | -115/+22880 |
| | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-20 | 129 | -115/+22880 |
| | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ \ | Merge remote branch 'origin/master' into mobility-master | Rohan McGovern | 2010-02-19 | 1227 | -17914/+115112 |
| | | | | | | |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Increase try verify timeout. | Aaron McCarthy | 2010-02-22 | 2 | -2/+2 |
| * | | | | | | | | | | | | | | Add locking to bearer code. | Aaron McCarthy | 2010-02-22 | 14 | -103/+297 |
| * | | | | | | | | | | | | | | Merge remote branch 'origin/master' into bearermanagement/unit-tests | Aaron McCarthy | 2010-02-22 | 1980 | -72198/+158783 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | / / / / / / / / | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Create unit-test in parent directory. | Aaron McCarthy | 2010-02-19 | 3 | -1/+12 |
| * | | | | | | | | | | | | | Allow QNAM to be created as a global variable. | Aaron McCarthy | 2010-02-18 | 2 | -3/+9 |
| * | | | | | | | | | | | | | Don't load NetworkManager plugin in NetworkManager is not available. | Aaron McCarthy | 2010-02-18 | 4 | -6/+20 |
| * | | | | | | | | | | | | | Merge remote branch 'origin/master' into bearermanagement/unit-tests | Aaron McCarthy | 2010-02-17 | 58 | -388/+703 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Disable NLA plugin, build generic on win32 and mac. | Aaron McCarthy | 2010-02-17 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | Fix QNetworkSession unit test. | Aaron McCarthy | 2010-02-16 | 3 | -10/+14 |
| * | | | | | | | | | | | | | | Fix segfault. | Aaron McCarthy | 2010-02-16 | 1 | -14/+17 |
| * | | | | | | | | | | | | | | Remove debug output. | Aaron McCarthy | 2010-02-16 | 1 | -4/+4 |
| * | | | | | | | | | | | | | | Make this a warning. | Aaron McCarthy | 2010-02-16 | 1 | -2/+2 |