diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-18 03:34:19 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-18 03:34:19 +0200 |
| commit | 348917e291077ae7760e3621eecee9753245ca9b (patch) | |
| tree | 78ad37bdb85bf5abb92bdcae5521c59f76ab8691 /bin | |
| parent | fd36b47e8758562fc9ff350f292fc9ae9ed91d4e (diff) | |
| parent | 095d5b74e571c71e04cc98ba4d372e3c5c2b1f9c (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
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.
QtMediaservices -> QtMediaServices.
configure; Fixes for changes to use mediaservices.
Fixed compile errors in pulseaudio backend for soundeffect
Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d
Fixed compile errors with gstreamer plugin
Create Mediaservices lib, separate from Multimedia.
Gstreamer media backend: seek to media start on end of stream.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/syncqt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/syncqt b/bin/syncqt index 71f2eabd8d..e36eeb670c 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -50,7 +50,8 @@ my %modules = ( # path to module name map "QtDBus" => "$basedir/src/dbus", "QtWebKit" => "$basedir/src/3rdparty/webkit/WebCore", "phonon" => "$basedir/src/phonon", - "QtMultimedia" => "$basedir/src/multimedia", + "QtMultimedia" => "$basedir/src/multimedia/multimedia", + "QtMediaServices" => "$basedir/src/multimedia/mediaservices", ); my %moduleheaders = ( # restrict the module headers to those found in relative path "QtWebKit" => "../WebKit/qt/Api", |