diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-04-16 01:03:11 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-04-16 01:03:11 (GMT) |
| commit | 05c4219c7689e012a096d1b9484c9c1aebc92bc1 (patch) | |
| tree | 7af3e498f5a4e54e887ab427837d1bbc5bae65de | |
| parent | 02252587013b691081bca0c4197e170960fe3355 (diff) | |
| download | Qt-05c4219c7689e012a096d1b9484c9c1aebc92bc1.zip Qt-05c4219c7689e012a096d1b9484c9c1aebc92bc1.tar.gz Qt-05c4219c7689e012a096d1b9484c9c1aebc92bc1.tar.bz2 | |
Revert "Fix previous merge commit."
This reverts commit ab31654127d7a6e9a06a2c75bc8b2832d68cdfc0.
| -rw-r--r-- | src/3rdparty/phonon/ds9/mediaobject.cpp | 3 |
1 files changed, 0 insertions, 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" |