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: (27 commits)
  Remove trace code from directshowaudioendpointcontrol.h.
  New configure.exe binary
  Add support for MSBuild, which is the project format for MSVC 2010
  Only add qvideowidget test once.
  Multimedia causes build failure when Qt is configured with -embedded
  Player demo: load not only local files but playlists and urls passed as
  Gstreamer media backend: preserve playback rate after seeks and media
  QT7 mediaservice; fix leaking strings.
  Fixed Qt build with mediaservices disabled.
  Multimedia tests; fix for missing dependency
  Disabled QMediaPlayer states debug output.
  Fixed typo in QMediaPlayer::play() error reporting
  Fixed QVideoWidget test, waiting for video surface painted.
  Tests; Fix media tests, make sure they are using mediaservies.
  Fix warning about illegal empty declaration.
  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.
  ...

1 files changed, 4 insertions, 0 deletions

diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp
index 60b8dcc..943a8a2 100644
--- a/tools/configure/environment.cpp
+++ b/tools/configure/environment.cpp
@@ -80,6 +80,7 @@ struct CompilerInfo{
     {CC_NET2003, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2003 (7.1)",  "Software\\Microsoft\\VisualStudio\\7.1\\Setup\\VC\\ProductDir", "cl.exe"}, // link.exe, lib.exe
     {CC_NET2005, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2005 (8.0)",  "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\8.0", "cl.exe"}, // link.exe, lib.exe
     {CC_NET2008, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2008 (9.0)",  "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\9.0", "cl.exe"}, // link.exe, lib.exe
+    {CC_NET2010, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2010 (10.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\10.0", "cl.exe"}, // link.exe, lib.exe
     {CC_UNKNOWN, "Unknown", 0, 0},
 };
 
@@ -105,6 +106,9 @@ QString Environment::detectQMakeSpec()
 {
     QString spec;
     switch (detectCompiler()) {
+    case CC_NET2010:
+        spec = "win32-msvc2010";
+        break;
     case CC_NET2008:
         spec = "win32-msvc2008";
         break;