summaryrefslogtreecommitdiffstats
path: root/src/multimedia/qml
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-272-0/+9
|\
| * Merge branch 'master' of git:qt/qt-multimedia-staging into qmlThiago Macieira2010-02-262-0/+9
| |\
| | * Qt namespace fixes.Justin McPherson2010-02-252-0/+9
* | | Merge remote branch 'origin/master' into 4.7Thiago Macieira2010-02-2710-119/+121
|\ \ \ | |/ /
| * | 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-248-4/+186
| |\ \ | | |/
| * | 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-2410-22/+32
| |\ \
| * | | 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/qt-multimedia-staging into...Qt Continuous Integration System2010-02-238-3/+57
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-238-3/+57
| |\ \
| | * | 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
| | |/
* | | Merge remote branch 'origin/master'Thiago Macieira2010-02-233-0/+8
|\ \ \ | |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-223-0/+8
| |\ \ | | |/ | |/|
| | * Fix compilation with namespace.ck2010-02-223-0/+8
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-228-22/+24
|\ \ \ | |/ / |/| |
| * | 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-229-9/+139
|\ \ \ | |/ / |/| |
| * | Documentation fixes.Justin McPherson2010-02-223-6/+6
| * | 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
|/
* Complete namespace move; QtMedia -> QtMultimediaJustin McPherson2010-02-192-72/+72
* Use the qmlmodule method for adding multimedia qml elements.Justin McPherson2010-02-196-7/+3
* Change namespace; QtMedia -> QtMultimediaJustin McPherson2010-02-191-74/+74
* Fixed compile error in pulseaudio soundeffect implementationKurt Korbatits2010-02-162-3/+3
* Cleanup include files.Justin McPherson2010-02-155-17/+50
* Use correct license headers.Justin McPherson2010-02-1510-20/+20
* Use correct path for private header.Justin McPherson2010-02-151-1/+1
* Use correct path for headers and source in qml.pri.Justin McPherson2010-02-151-6/+6
* maemo define spelling incorrect.Kurt Korbatits2010-02-091-1/+1
* Update QML media element documentation.Andrew den Exter2010-02-082-54/+628
* Correct QtMedia::SampleRate property mapping.Andrew den Exter2010-02-081-1/+1
* qmlsound changed to soundeffect element.Kurt Korbatits2010-02-0512-195/+1786
* Fix license headers.Andrew den Exter2010-02-051-2/+2
* Remove deprecated enum and member variables from video graphics items.Andrew den Exter2010-02-052-5/+0
* Make the paused property of the QML media elements indepent of playing.Andrew den Exter2010-02-054-25/+73
* Don't emit the metaDataChanged signal twice on a meta-data write.Andrew den Exter2010-02-051-3/+1
* Propagate error signals from QMediaPlayerControl to media QML elements.Andrew den Exter2010-02-056-9/+20
* Connect changed signals from QMediaPlayerControl to media QML elements.Andrew den Exter2010-02-051-0/+6
* Round off volume when converting from real to int.Andrew den Exter2010-02-051-2/+4
* Construct the meta-object directly instead of using QMetaObjectBuilder.Andrew den Exter2010-02-032-49/+175