diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-05-19 15:52:54 +0200 |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-05-19 15:52:54 +0200 |
| commit | 14ddb8172cce8c90f01436ab8215cc8ed594e251 (patch) | |
| tree | 04e860f80d7f3e9773996b62d4c56ad92497a096 /bin | |
| parent | 6bdba9c7909d8f53e28823b16e82f89650eea16d (diff) | |
| parent | de0858687898f6e0e54cce3f986779c7aa1a350e (diff) | |
| download | qt4-tools-14ddb8172cce8c90f01436ab8215cc8ed594e251.tar.gz | |
Merge commit 'remotes/origin/4.7' into symbian47
Conflicts:
src/gui/kernel/qapplication_s60.cpp
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/syncqt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/syncqt b/bin/syncqt index e36eeb670c..71f2eabd8d 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -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", |