summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-18 23:44:37 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-18 23:44:37 (GMT)
commitfdb5a0fe7a465c0d193260eea94f7caf36263265 (patch)
treefdaf580979cf8df59ec691bc048f48c54efb716f /bin
parenta584ce0be29e9cb5cb0b627c71e4147011013418 (diff)
parent348917e291077ae7760e3621eecee9753245ca9b (diff)
downloadQt-fdb5a0fe7a465c0d193260eea94f7caf36263265.zip
Qt-fdb5a0fe7a465c0d193260eea94f7caf36263265.tar.gz
Qt-fdb5a0fe7a465c0d193260eea94f7caf36263265.tar.bz2
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-xbin/syncqt3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/syncqt b/bin/syncqt
index 71f2eab..e36eeb6 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",