Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-27 | 4 | -0/+19 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-26 | 4 | -0/+19 | |
| |\ \ \ | | |/ / | |/| | | ||||||
| | * | | Merge branch 'master' of git:qt/qt-multimedia-staging into qml | Thiago Macieira | 2010-02-26 | 4 | -0/+19 | |
| | |\ \ | ||||||
| | | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-26 | 4 | -0/+19 | |
| | | |\ \ | ||||||
| | | | * \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging | Justin McPherson | 2010-02-25 | 2 | -0/+10 | |
| | | | |\ \ | ||||||
| | | | | * | | QMediaContent: Add a convenience method to retrieve the QNetworkRequest. | Justin McPherson | 2010-02-25 | 2 | -0/+10 | |
| | | | * | | | Qt namespace fixes. | Justin McPherson | 2010-02-25 | 2 | -0/+9 | |
| | | | |/ / | ||||||
* | | | | | | Merge remote branch 'origin/master' into 4.7 | Thiago Macieira | 2010-02-27 | 16 | -349/+332 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-... | Qt Continuous Integration System | 2010-02-26 | 6 | -230/+211 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-02-26 | 6 | -230/+211 | |
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/| | ||||||
| | | * | | win32 backend for low-level audio doesn't pass new unit tests | Kurt Korbatits | 2010-02-23 | 2 | -26/+78 | |
| | | * | | alsa backend for low-level audio doesn't pass new unit tests | Kurt Korbatits | 2010-02-23 | 2 | -118/+67 | |
| | | * | | Updates to low-level audio documentation. | Kurt Korbatits | 2010-02-23 | 2 | -86/+66 | |
| * | | | | Merge remote branch 'qt/master' into qml-master | Qt Continuous Integration System | 2010-02-26 | 22 | -8/+31 | |
| |\ \ \ \ | | |/ / / | ||||||
| * | | | | Introduced QDeclarativeExtensionPlugin::registerTypes(uri). | Roberto Raggi | 2010-02-25 | 2 | -8/+5 | |
| * | | | | Fix up some rename confusion. | Justin McPherson | 2010-02-25 | 3 | -133/+1 | |
| * | | | | Make QML_REGISTER...TYPE functions unnecessary (still exist for now). | Warwick Allison | 2010-02-25 | 1 | -4/+4 | |
| * | | | | Fix include of renamed header | Justin McPherson | 2010-02-25 | 2 | -2/+2 | |
| * | | | | Change Multimedia declarative module in line with recent commits. | Justin McPherson | 2010-02-25 | 2 | -7/+12 | |
| * | | | | Merge branch 'master' of ../../qt/master | Justin McPherson | 2010-02-24 | 11 | -6/+201 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| * | | | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDec... | Warwick Allison | 2010-02-24 | 10 | -119/+119 | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-24 | 12 | -26/+39 | |
| |\ \ \ \ | ||||||
| * | | | | | Get rid of QmlModulePlugin. | Roberto Raggi | 2010-02-23 | 2 | -5/+9 | |
* | | | | | | doc: Added \since 4.7 to several \qmlclass elements. | Martin Smith | 2010-02-26 | 3 | -0/+3 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-24 | 22 | -8/+31 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Doc: add \since 4.7 to new QtMultimedia classes | Volker Hilsheimer | 2010-02-24 | 22 | -8/+31 | |
| | |/ / | |/| | | ||||||
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-24 | 10 | -3/+72 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-23 | 10 | -3/+72 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-23 | 10 | -3/+72 | |
| | |\ \ \ | ||||||
| | | * \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging | Nicholas Young | 2010-02-23 | 15 | -20/+208 | |
| | | |\ \ \ | ||||||
| | | | * | | | Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. | Justin McPherson | 2010-02-23 | 3 | -3/+3 | |
| | | | * | | | Add private header warning. | Justin McPherson | 2010-02-23 | 5 | -0/+54 | |
| | | | |/ / | ||||||
| | | * | | | Added QNetworkRequest constructor to QMediaContent. | Nicholas Young | 2010-02-23 | 2 | -0/+15 | |
* | | | | | | compile fix with namespaces after a broken automatical merge | hjk | 2010-02-24 | 1 | -2/+0 | |
|/ / / / / | ||||||
* | | | | | Merge remote branch 'origin/master' | Thiago Macieira | 2010-02-23 | 5 | -2/+13 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast... | Qt Continuous Integration System | 2010-02-22 | 5 | -4/+15 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | Fix compilation with namespace. | ck | 2010-02-22 | 5 | -4/+15 | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-22 | 10 | -25/+27 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Cocoa: fix namespace build | Richard Moe Gustavsen | 2010-02-22 | 2 | -3/+3 | |
| * | | | | doc: Fixed some qdoc errors. | Martin Smith | 2010-02-22 | 3 | -7/+7 | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-22 | 6 | -20/+22 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Fix compilation on HP-UXi: m_volume is a #define | Thiago Macieira | 2010-02-20 | 6 | -20/+20 | |
| | * | | | Fix compilation on recent Linux systems: getpid(2) is in unistd.h. | Thiago Macieira | 2010-02-20 | 1 | -0/+2 | |
| | |/ / | ||||||
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-22 | 11 | -19/+153 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Documentation fixes. | Justin McPherson | 2010-02-22 | 5 | -16/+20 | |
| * | | | Add a qRegisterQmlElements function to QtMultimedia | Justin McPherson | 2010-02-22 | 6 | -3/+133 | |
| |/ / | ||||||
* | | | QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit. | Daniel Molkentin | 2010-02-21 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast... | Qt Continuous Integration System | 2010-02-19 | 3 | -6/+6 | |
|\ \ | ||||||
| * | | optimization: get rid of QString::fromUtf16() usage, part 2 | Oswald Buddenhagen | 2010-02-16 | 3 | -6/+6 | |
* | | | Complete namespace move; QtMedia -> QtMultimedia | Justin McPherson | 2010-02-19 | 4 | -76/+76 | |