summaryrefslogtreecommitdiffstats
path: root/src/multimedia/base/qmediacontent.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-261-0/+9
|\
| * QMediaContent: Add a convenience method to retrieve the QNetworkRequest.Justin McPherson2010-02-251-0/+9
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-241-0/+1
|\ \ | |/ |/|
| * Doc: add \since 4.7 to new QtMultimedia classesVolker Hilsheimer2010-02-241-0/+1
* | Added QNetworkRequest constructor to QMediaContent.Nicholas Young2010-02-231-0/+13
|/
* Move QtMobility multimedia framework into Qt.Justin McPherson2010-01-151-0/+219