diff options
author | Thomas McGuire <thomas.mcguire@kdab.com> | 2012-04-12 11:14:04 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-25 04:02:15 +0200 |
commit | 7c84225cc877ef76143e1f476d0179bfb0594f02 (patch) | |
tree | 9ba3d564049c0526cb25504c7e0867cc10a19008 /tests/auto/unit/qmultimedia_common/mockvideo.pri | |
parent | a775af111bde7810ebd18ad9f02ff096a3f74cb6 (diff) |
Move QVideoWindowControl out of widgets.
There is no widget dependency in it, and this enables the QML
Video element to support video overlays later.
Change-Id: I7ebcde350f9595a9f7c319663ff745930535a8a7
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'tests/auto/unit/qmultimedia_common/mockvideo.pri')
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockvideo.pri | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/auto/unit/qmultimedia_common/mockvideo.pri b/tests/auto/unit/qmultimedia_common/mockvideo.pri index ea991661f..a2492298c 100644 --- a/tests/auto/unit/qmultimedia_common/mockvideo.pri +++ b/tests/auto/unit/qmultimedia_common/mockvideo.pri @@ -3,12 +3,8 @@ INCLUDEPATH += $$PWD \ ../../../src/multimedia \ ../../../src/multimedia/video -contains(QT,multimediawidgets)|contains(QT,multimediawidgets-private) { - HEADERS *= ../qmultimedia_common/mockvideowindowcontrol.h - DEFINES *= QT_MULTIMEDIA_MOCK_WIDGETS -} - HEADERS *= \ ../qmultimedia_common/mockvideosurface.h \ - ../qmultimedia_common/mockvideorenderercontrol.h + ../qmultimedia_common/mockvideorenderercontrol.h \ + ../qmultimedia_common/mockvideowindowcontrol.h |