diff options
| author | aavit <qt-info@nokia.com> | 2010-04-08 14:08:00 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-04-08 14:08:00 (GMT) |
| commit | 0d49bd5b518ab4253baf2e30fe6a0c6d2e8651ea (patch) | |
| tree | 797f230b26d1f90dd126b6a25dce2a341784e964 /src/3rdparty/phonon/ds9/videorenderer_vmr9.h | |
| parent | 4a557f79976d7b6cbb1fa35d728cba784dc32a09 (diff) | |
| parent | bf195e57ff96c326fa26c6b3a4f64e26d18fd9bd (diff) | |
| download | Qt-0d49bd5b518ab4253baf2e30fe6a0c6d2e8651ea.zip Qt-0d49bd5b518ab4253baf2e30fe6a0c6d2e8651ea.tar.gz Qt-0d49bd5b518ab4253baf2e30fe6a0c6d2e8651ea.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/3rdparty/phonon/ds9/videorenderer_vmr9.h')
| -rw-r--r-- | src/3rdparty/phonon/ds9/videorenderer_vmr9.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/ds9/videorenderer_vmr9.h b/src/3rdparty/phonon/ds9/videorenderer_vmr9.h index 4eb237e..516d79d 100644 --- a/src/3rdparty/phonon/ds9/videorenderer_vmr9.h +++ b/src/3rdparty/phonon/ds9/videorenderer_vmr9.h @@ -19,7 +19,6 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #define PHONON_VIDEORENDERER_VMR9_H #include "abstractvideorenderer.h" -#include "compointer.h" QT_BEGIN_NAMESPACE |