Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵ | Qt Continuous Integration System | 2010-02-22 | 11 | -19/+153 |
|\ | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Documentation fixes. Add a qRegisterQmlElements function to QtMultimedia | ||||
| * | Documentation fixes. | Justin McPherson | 2010-02-22 | 5 | -16/+20 |
| | | | | | | | | Reviewed-by: Nicholas Young | ||||
| * | Add a qRegisterQmlElements function to QtMultimedia | Justin McPherson | 2010-02-22 | 6 | -3/+133 |
| | | | | | | | | | | | | Avoid exposing private classes. Reviewed-by: Bill King | ||||
* | | 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 ↵ | Qt Continuous Integration System | 2010-02-19 | 3 | -6/+6 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (25 commits) Add convenience function QTextCursor::positionInBlock() Fixed URL in Russian translation. Designer/Resourceview: Suppress warning about QFileInfo on empty path. optimize qstring::simplified() Revert optimizations to QString::append unbreak QList::append() and co. again Implement bookmark manager widget. optimization: use QList::reserve() and QVector::reserve() amend "purge msvc.net and msvc2002 makespecs" Added QPlainTextEditor::anchorAt(const QPoint &pos) Fix memmory leak. Fix spacing. Prevent renaming the bookmarks menu root item, it's just a placeholder. Fix broken set last shown pagen when the last page was about:blank. Move launch with external app in base class. Make sure the bookmarks menu updates on add/ remove as well. Fix broken Drag&Drop, reset and clear the model if we set new bookmarks. avoid double reallocations in appending operations avoid double reallocation in string-growing replace() case optimize qHash() some more ... | ||||
| * | optimization: get rid of QString::fromUtf16() usage, part 2 | Oswald Buddenhagen | 2010-02-16 | 3 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | QString::fromUtf16() is slow - it does a BOM check and optionally byte swapping, which is utterly irrelevant when converting internal data structures which are raw utf16 in host byte order. so replace it with QString::fromUnicode() where possible (which seems to be everywhere). the reasoning is the same as in commit e0fda52f, so not getting further reviews. Reviewed-by: denis Reviewed-by: joao | ||||
* | | Complete namespace move; QtMedia -> QtMultimedia | Justin McPherson | 2010-02-19 | 4 | -76/+76 |
| | | |||||
* | | Use the qmlmodule method for adding multimedia qml elements. | Justin McPherson | 2010-02-19 | 6 | -7/+3 |
| | | |||||
* | | Change namespace; QtMedia -> QtMultimedia | Justin McPherson | 2010-02-19 | 10 | -102/+102 |
| | | |||||
* | | Switch RGB24 and BGR24 shaders back. | Andrew den Exter | 2010-02-18 | 1 | -4/+4 |
| | | | | | | | | | | | | This reverts a7f6af9817771b8211433c8cf24fe7150c5b7bf5. The original relationship was consistent with QImage's RGB24, making the direct show RGB24 format BGR24. | ||||
* | | Make QMediaPlaylist test pass. | Andrew den Exter | 2010-02-17 | 1 | -1/+0 |
| | | | | | | | | | | The test was failing because an ignored warning wasn't being output. Remove both the warning and ignore statements. | ||||
* | | Fix QMediaPlayer test failure. | Andrew den Exter | 2010-02-17 | 5 | -12/+11 |
| | | | | | | | | | | | | Prepending the Qt namespace with QT_PREPEND_NAMESPACE in a Q_DECLARE_METATYPE statement is unecessary and appears not to work with signal declarations in QSignalSpy. | ||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team | Justin McPherson | 2010-02-17 | 1 | -2/+74 |
|\ \ | |||||
| * | | Support YUV444 formats in QPainterVideoSurface. | Andrew den Exter | 2010-02-17 | 1 | -2/+74 |
| | | | |||||
* | | | Fix license headers. | Justin McPherson | 2010-02-17 | 2 | -4/+4 |
|/ / | |||||
* | | Don't paint RGB24 frames as BGR24. | Andrew den Exter | 2010-02-16 | 1 | -0/+26 |
| | | | | | | | | | | | | A non-swizzling shader was being used for RGB24. This looked correct on linux because the gstreamer backend was misidentifying BGR24 as RGB24. And since BGR is supported include it in the list of supported formats. | ||||
* | | Fixed compile error in pulseaudio soundeffect implementation | Kurt Korbatits | 2010-02-16 | 2 | -3/+3 |
| | | |||||
* | | Exclude OpenGL from QGraphicsVideoItem if Qt doesn't include QtOpenGL. | Andrew den Exter | 2010-02-16 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia | Justin McPherson | 2010-02-15 | 2 | -15/+17 |
|\ \ | |||||
| * | | Fix flickering when items are overlaid on QGraphicsVideoItem. | Andrew den Exter | 2010-02-15 | 2 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | Re-enable scissor and stencil tests so the texture frame is clipped correctly. Otherwise when an overlaid item is updated the entire frame will be redrawn not just the part intersecting the updated item, resulting in other items being drawn over. | ||||
| * | | Extend hue rotation to a full 360 degrees. | Andrew den Exter | 2010-02-15 | 1 | -1/+1 |
| | | | |||||
| * | | Fix hue rotation in QPainterVideoSurface. | Andrew den Exter | 2010-02-15 | 1 | -9/+9 |
| | | | |||||
* | | | Add missing QT_MODULE to header. | Justin McPherson | 2010-02-15 | 1 | -0/+2 |
| | | | |||||
* | | | Cleanup include files. | Justin McPherson | 2010-02-15 | 5 | -17/+50 |
| | | | |||||
* | | | Use correct license headers. | Justin McPherson | 2010-02-15 | 10 | -20/+20 |
| | | | |||||
* | | | Use correct path for private header. | Justin McPherson | 2010-02-15 | 1 | -1/+1 |
| | | | |||||
* | | | Use correct path for headers and source in qml.pri. | Justin McPherson | 2010-02-15 | 1 | -6/+6 |
| | | | |||||
* | | | Merge branch 'master' of ../../qt/master | Justin McPherson | 2010-02-14 | 6 | -4/+12 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 4 | -4/+0 |
| |\ | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp | ||||
| | * | Doc: remove \preliminary tag from public multimedia classes | Volker Hilsheimer | 2010-02-12 | 4 | -4/+0 |
| | | | |||||
| * | | Doc: more \since 4.7 | Volker Hilsheimer | 2010-02-05 | 1 | -0/+4 |
| | | | |||||
| * | | Doc: add \since 4.7 to new functions. | Volker Hilsheimer | 2010-02-05 | 1 | -0/+8 |
| | | | |||||
* | | | Add virtual destructors to QMediaObjectPrivate and QMediaServicePrivate. | Andrew den Exter | 2010-02-11 | 3 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | This reverts aec0628295cda95f2169e3007368797ba6585ee3 and fixes the actual problem, which is the destructors for for classes inheriting QMediaObjectPrivate weren't being called resulting in QPointer destructors also not being called. | ||||
* | | | Fix crash on exit in player example on Windows. | Andrew den Exter | 2010-02-10 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | Explicitly clear the QPointer to QVideoWidget on destruction, otherwise the destruction of the QVideoWidget will seeminly attempt to clear an invalidated QPointer. | ||||
* | | | maemo define spelling incorrect. | Kurt Korbatits | 2010-02-09 | 1 | -1/+1 |
| | | | |||||
* | | | Don't clear the video output when the video widget is hidden. | Andrew den Exter | 2010-02-08 | 2 | -18/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Changing the video output is a heavy task and is likely to interrupt playback. Not really worth the cost for knowing the video isn't being decoded while it cant be seen. This also applies to the QGraphicsVideoItem. | ||||
* | | | Update QML media element documentation. | Andrew den Exter | 2010-02-08 | 2 | -54/+628 |
| | | | |||||
* | | | Correct QtMedia::SampleRate property mapping. | Andrew den Exter | 2010-02-08 | 1 | -1/+1 |
| | | | | | | | | | | | | Was mapped to frequency instead of sampleRate. | ||||
* | | | Remove documentation for QGraphicsVideoItem::FillMode. | Andrew den Exter | 2010-02-08 | 1 | -12/+0 |
| | | | | | | | | | | | | No longer exists. | ||||
* | | | Make nativeSizeChanged() signal non-const. | Andrew den Exter | 2010-02-08 | 1 | -1/+1 |
| | | | |||||
* | | | qmlsound changed to soundeffect element. | Kurt Korbatits | 2010-02-05 | 12 | -195/+1786 |
| | | | |||||
* | | | Fix license headers. | Andrew den Exter | 2010-02-05 | 1 | -2/+2 |
| | | | |||||
* | | | Add an internal function for setting the default media servie provider. | Andrew den Exter | 2010-02-05 | 2 | -0/+27 |
| | | | | | | | | | | | | This allows auto tests to override the default service provider. | ||||
* | | | Remove deprecated enum and member variables from video graphics items. | Andrew den Exter | 2010-02-05 | 3 | -12/+0 |
| | | | |||||
* | | | Make the paused property of the QML media elements indepent of playing. | Andrew den Exter | 2010-02-05 | 4 | -25/+73 |
| | | | |||||
* | | | Don't emit the metaDataChanged signal twice on a meta-data write. | Andrew den Exter | 2010-02-05 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | The QMetaDataControl implementation will emeit the changed signal when appropriate, so it's not necessary to emit it in QMetaDataControlMetaObject as well. | ||||
* | | | Propagate error signals from QMediaPlayerControl to media QML elements. | Andrew den Exter | 2010-02-05 | 6 | -9/+20 |
| | | | |||||
* | | | Connect changed signals from QMediaPlayerControl to media QML elements. | Andrew den Exter | 2010-02-05 | 1 | -0/+6 |
| | | | |||||
* | | | Round off volume when converting from real to int. | Andrew den Exter | 2010-02-05 | 1 | -2/+4 |
| | | | | | | | | | | | | And return a volume of 0 if there's no player control. | ||||
* | | | Added QNetworkRequest constructor to QMediaResource. | Nicholas Young | 2010-02-04 | 3 | -3/+28 |
| | | |