From 05c4219c7689e012a096d1b9484c9c1aebc92bc1 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Fri, 16 Apr 2010 11:03:11 +1000
Subject: Revert "Fix previous merge commit."

This reverts commit ab31654127d7a6e9a06a2c75bc8b2832d68cdfc0.
---
 src/3rdparty/phonon/ds9/mediaobject.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/3rdparty/phonon/ds9/mediaobject.cpp b/src/3rdparty/phonon/ds9/mediaobject.cpp
index d640956..34f92c2 100644
--- a/src/3rdparty/phonon/ds9/mediaobject.cpp
+++ b/src/3rdparty/phonon/ds9/mediaobject.cpp
@@ -27,9 +27,6 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include <objbase.h>
 #include <initguid.h>
 #include <qnetwork.h>
-#ifdef Q_CC_MSVC
-# include <comdef.h>
-#endif
 #include <evcode.h>
 
 #include "mediaobject.h"
-- 
cgit v0.12