diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-20 09:43:37 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-20 09:43:37 (GMT) |
| commit | 30ffe43f826baae366b6e745d077ade316512d3b (patch) | |
| tree | 3e8c020ec99a5d69b9787a8d164a2f326936eebc /bin/syncqt | |
| parent | e7989aeb09f7c597edf3498183bd97bd0122382b (diff) | |
| parent | 99f6250a4ac031b70757442715b226bc339ab699 (diff) | |
| download | Qt-30ffe43f826baae366b6e745d077ade316512d3b.zip Qt-30ffe43f826baae366b6e745d077ade316512d3b.tar.gz Qt-30ffe43f826baae366b6e745d077ade316512d3b.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Diffstat (limited to 'bin/syncqt')
| -rwxr-xr-x | bin/syncqt | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -50,8 +50,7 @@ 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/multimedia", - "QtMediaServices" => "$basedir/src/multimedia/mediaservices", + "QtMultimedia" => "$basedir/src/multimedia", ); my %moduleheaders = ( # restrict the module headers to those found in relative path "QtWebKit" => "../WebKit/qt/Api", |