diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-04-15 10:32:27 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-04-15 10:32:27 (GMT) |
| commit | ab31654127d7a6e9a06a2c75bc8b2832d68cdfc0 (patch) | |
| tree | 6b341f7ceab1d64124060d47ce440f695c4b5e53 /src/3rdparty | |
| parent | 1d267f33d179abbac753a72c2235e7fb07c4def7 (diff) | |
| download | Qt-ab31654127d7a6e9a06a2c75bc8b2832d68cdfc0.zip Qt-ab31654127d7a6e9a06a2c75bc8b2832d68cdfc0.tar.gz Qt-ab31654127d7a6e9a06a2c75bc8b2832d68cdfc0.tar.bz2 | |
Fix previous merge commit.
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/ds9/mediaobject.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/phonon/ds9/mediaobject.cpp b/src/3rdparty/phonon/ds9/mediaobject.cpp index 34f92c2..d640956 100644 --- a/src/3rdparty/phonon/ds9/mediaobject.cpp +++ b/src/3rdparty/phonon/ds9/mediaobject.cpp @@ -27,6 +27,9 @@ 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" |