| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |\ |
|
| | |\
| | |
| | |
| | | |
into 4.7
|
| | | |
| | |
| | |
| | | |
Reviewed-by:Dmytro Poplavskiy
|
| | |/
|/|
| |
| | |
Reviewed-by:Derick Hawcroft
|
| |/
|
|
| |
Reviewed-by:Andrew den Exter
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (27 commits)
Remove trace code from directshowaudioendpointcontrol.h.
New configure.exe binary
Add support for MSBuild, which is the project format for MSVC 2010
Only add qvideowidget test once.
Multimedia causes build failure when Qt is configured with -embedded
Player demo: load not only local files but playlists and urls passed as
Gstreamer media backend: preserve playback rate after seeks and media
QT7 mediaservice; fix leaking strings.
Fixed Qt build with mediaservices disabled.
Multimedia tests; fix for missing dependency
Disabled QMediaPlayer states debug output.
Fixed typo in QMediaPlayer::play() error reporting
Fixed QVideoWidget test, waiting for video surface painted.
Tests; Fix media tests, make sure they are using mediaservies.
Fix warning about illegal empty declaration.
Three fixes from Shane after QtMultimedia was split into two dlls.
Fix compile errors in Direct Show media service.
Add EXPORT defines for QtMediaServices library.
Fixed configure check for gstreamer.
WebKit; build with change to mediaservices.
...
|
| |
|
|
|
|
| |
It was enabled accidentally.
Reviewed-by: trustme
|
| |
|
|
|
|
|
| |
Parameters to invokeMethod were omitted,
so error was not reported.
Reviewed-by: Justin McPherson
|
| |
|
|
|
|
| |
Q_PRIVATE_SLOT declarations don't require a semi-colon.
Reviewed-by: Justin McPherson
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix1: QtMultimedia to get .def files from the correct location
multimedia was split into 2 subdirectories, which means the general
purpose rule in qbase.pri no longer works.
Task-number: QTBUG-9983
Reviewed-by: Miikka Heikkinen
Fix2: Fix QtMultimedia .def files
As a result of the split of multimedia into two DLLs, made the following
changes:
1. Revert QtMultimediau.def to v4.6.2 (compatibility baseline)
2. Freeze QtMultimedia and QtMediaServices
This is compatible with 4.6.2, but not compatible with any previous 4.7
build.
Task-number: QTBUG-9983
Fix3: Add QtMediaServices.dll to Qt.sis
The new dll will now be installed by the symbian sis package.
Task-number: QTBUG-9983
Reviewed-by: Miikka Heikkinen
|
| |
|
|
| |
Reviewed-by: Justin McPherson
|
| |
|
|
| |
Reviewed-by: Dmytro Poplavskiy
|
| |\
| |
| |
| | |
into 4.7
|
| | |
| |
| |
| | |
Reviewed-by:Dmytro Poplavskiy
|
| |/
|
|
|
| |
Conflicts:
configure
|
| |
|
|
| |
into 4.7
|
| |
|
