summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Expand)AuthorAgeFilesLines
* Fixed compiler warnings when compiling multimedia module.Kurt Korbatits2010-03-033-7/+11
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-274-0/+19
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-264-0/+19
| |\
| | * Merge branch 'master' of git:qt/qt-multimedia-staging into qmlThiago Macieira2010-02-264-0/+19
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-264-0/+19
| | | |\
| | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-stagingJustin McPherson2010-02-252-0/+10
| | | | |\
| | | | | * QMediaContent: Add a convenience method to retrieve the QNetworkRequest.Justin McPherson2010-02-252-0/+10
| | | | * | Qt namespace fixes.Justin McPherson2010-02-252-0/+9
| | | | |/
* | | | | Merge remote branch 'origin/master' into 4.7Thiago Macieira2010-02-2716-349/+332
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-266-230/+211
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-266-230/+211
| | |\ \ \ | | | |/ / | | |/| |
| | | * | win32 backend for low-level audio doesn't pass new unit testsKurt Korbatits2010-02-232-26/+78
| | | * | alsa backend for low-level audio doesn't pass new unit testsKurt Korbatits2010-02-232-118/+67
| | | * | Updates to low-level audio documentation.Kurt Korbatits2010-02-232-86/+66
| * | | | Merge remote branch 'qt/master' into qml-masterQt Continuous Integration System2010-02-2622-8/+31
| |\ \ \ \ | | |/ / /
| * | | | Introduced QDeclarativeExtensionPlugin::registerTypes(uri).Roberto Raggi2010-02-252-8/+5
| * | | | Fix up some rename confusion.Justin McPherson2010-02-253-133/+1
| * | | | Make QML_REGISTER...TYPE functions unnecessary (still exist for now).Warwick Allison2010-02-251-4/+4
| * | | | Fix include of renamed headerJustin McPherson2010-02-252-2/+2
| * | | | Change Multimedia declarative module in line with recent commits.Justin McPherson2010-02-252-7/+12
| * | | | Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-2411-6/+201
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDec...Warwick Allison2010-02-2410-119/+119
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-2412-26/+39
| |\ \ \ \
| * | | | | Get rid of QmlModulePlugin.Roberto Raggi2010-02-232-5/+9
* | | | | | doc: Added \since 4.7 to several \qmlclass elements.Martin Smith2010-02-263-0/+3
| |_|_|/ / |/| | | |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-2422-8/+31
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Doc: add \since 4.7 to new QtMultimedia classesVolker Hilsheimer2010-02-2422-8/+31
| | |/ / | |/| |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2410-3/+72
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2310-3/+72
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2310-3/+72
| | |\ \ \
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-stagingNicholas Young2010-02-2315-20/+208
| | | |\ \ \
| | | | * | | Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.Justin McPherson2010-02-233-3/+3
| | | | * | | Add private header warning.Justin McPherson2010-02-235-0/+54
| | | | |/ /
| | | * | | Added QNetworkRequest constructor to QMediaContent.Nicholas Young2010-02-232-0/+15
* | | | | | compile fix with namespaces after a broken automatical mergehjk2010-02-241-2/+0
|/ / / / /
* | | | | Merge remote branch 'origin/master'Thiago Macieira2010-02-235-2/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-225-4/+15
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix compilation with namespace.ck2010-02-225-4/+15
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-2210-25/+27
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Cocoa: fix namespace buildRichard Moe Gustavsen2010-02-222-3/+3
| * | | | doc: Fixed some qdoc errors.Martin Smith2010-02-223-7/+7
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-226-20/+22
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix compilation on HP-UXi: m_volume is a #defineThiago Macieira2010-02-206-20/+20
| | * | | Fix compilation on recent Linux systems: getpid(2) is in unistd.h.Thiago Macieira2010-02-201-0/+2
| | |/ /
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2211-19/+153
|\ \ \ \ | |/ / / |/| | |
| * | | Documentation fixes.Justin McPherson2010-02-225-16/+20
| * | | Add a qRegisterQmlElements function to QtMultimediaJustin McPherson2010-02-226-3/+133
| |/ /
* | | QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.Daniel Molkentin2010-02-211-1/+1
|/ /
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-193-6/+6
|\ \
| * | optimization: get rid of QString::fromUtf16() usage, part 2Oswald Buddenhagen2010-02-163-6/+6
generated by cgit v0.12 at 2024-12-01 09:09:47 (GMT)