summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-012-0/+10
|\ | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro
| * Add media elements to the QML Elements docs.Martin Jones2010-04-012-0/+10
| |
* | Fix 'make sis' finding the dll on symbianThomas Zander2010-03-311-1/+1
|/
* Fix installation of qmldir filesAlan Alpert2010-03-301-1/+1
| | | | | | | The old pro files did not actually install the qmldir files in clean builds. These ones should work. Reviewed-by: Harald Fernengel
* Add Symbian deploy section for qml import pluginsJoona Petrell2010-03-261-0/+11
| | | | | Task-number: QTBUG-9364 Reviewed-by: jbarron
* doc: Fixed all the remaining qdoc errors. For now.Martin Smith2010-03-242-2/+2
|
* Rename m_volume to m_volThiago Macieira2010-03-202-6/+6
| | | | HP-UX has a #define somewhere for m_volume
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-196-115/+267
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Add autoLoad property to multimedia declarative elements. Fix; QML Video item is sensitive to property assignment order
| * Add autoLoad property to multimedia declarative elements.Justin McPherson2010-03-196-8/+62
| | | | | | | | | | Task-number: QTBUG-8947 Reviewed-by: Andrew den Exter
| * Fix; QML Video item is sensitive to property assignment orderJustin McPherson2010-03-196-114/+212
| | | | | | | | | | Task-number: QTBUG-8605 Reviewed-by: Andrew den Exter
* | Fix installation of imports librariesTobias Hunger2010-03-121-2/+2
| |
* | Use TARGETPATH instead of hardcoding locationsTobias Hunger2010-03-101-1/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-082-4/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (74 commits) Assistant: Fix compile warning for empty header. Doc: mark QEasingCurve support functions as new in 4.7. Modify the XML test suite not to use non-characters. Autotest: Fix failing QTextCodec tests Doc: mark methods as internal (as they were in previous releases) Doc: add image for Qt Quick to "What's New" page. qdoc: Clear a static multimap after each qdocconf file. qdoc: Added some debug output to track down a crash Fixed mouse wheel handling in scrollareas. Added two missing keys for X11 Carbon: usage of menu bars can cause exceptions to be thrown Mac: compile fix Fix build JPEG plugin: Use switch() instead of if() don't try to build corewlan plugin when corewlan was not found at configure Avoid conversion to/from QChar in the cn codec to unicode Avoid memory allocations in conversion from Gb2312/Gb18030 to unicode fix corewlan detection error when building for 10.5 when 10.6 is also fixed treatment of zlib on Mac when crossbuilding Partial overloading support for qdbus cli tool. ...
| * doc: Fixed some QML qdoc errors.Martin Smith2010-03-052-4/+6
| |
* | Always copy the qmldir files into the build directoryTobias Hunger2010-03-081-2/+2
|/ | | | ... even when -prefix is set
* Move the multimedia files to the correct place.Martin Jones2010-03-048-0/+2684
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-042-5/+26
| | | | | Conflicts: src/src.pro
* Fix build of importsTobias Hunger2010-03-023-0/+79
* Fix export macro used in webkit * Fix dependencies on declarative/mutlimedia * Copy qmldir files into the build tree