summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2010-02-25 07:34:52 (GMT)
committerAndrew den Exter <andrew.den-exter@nokia.com>2010-02-25 07:34:52 (GMT)
commit8d98125460c223c5b9da017edd4a05dba8ba82af (patch)
treea5b7eacb658caae1f7261a3db01397a0ccca4410
parent4124bff7eb55ca2026bb89198950991a0804d0e6 (diff)
downloadQt-8d98125460c223c5b9da017edd4a05dba8ba82af.zip
Qt-8d98125460c223c5b9da017edd4a05dba8ba82af.tar.gz
Qt-8d98125460c223c5b9da017edd4a05dba8ba82af.tar.bz2
Make the Direct Show media service compile with a Qt namespace.
Move a QFile include outside the namespace. Reviewed-by: Justin McPherson
-rw-r--r--src/plugins/mediaservices/directshow/mediaplayer/directshowiosource.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowiosource.h b/src/plugins/mediaservices/directshow/mediaplayer/directshowiosource.h
index 3eb9a88..1d917df 100644
--- a/src/plugins/mediaservices/directshow/mediaplayer/directshowiosource.h
+++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowiosource.h
@@ -47,12 +47,12 @@
#include "directshowmediatype.h"
#include "directshowmediatypelist.h"
+#include <QtCore/qfile.h>
+
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-#include <QtCore/qfile.h>
-
class DirectShowIOSource
: public DirectShowMediaTypeList
, public IBaseFilter