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:
  removed test file, part of mediaservice removal.
  Rebuild configure.exe
  Rebuild configure following the removal of media services.
  More mediaservices removal work.
  Removed mediaservices.

1 files changed, 1 insertions, 2 deletions

diff --git a/bin/syncqt b/bin/syncqt
index e36eeb6..71f2eab 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",