diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-19 17:14:43 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-19 17:15:56 +0100 |
commit | d396262bc9771cacbc71e79215768984fa1974ff (patch) | |
tree | e029399524feabed6ebe0ee1e010af9f5e58932d /src/plugins/wmf/wmf.pro | |
parent | 0ce2cb3ebe6289e3db14438560fa186d9e5186b8 (diff) | |
parent | 2db2cde0d8433ad1aed59412717c4cddf496ba66 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/multimedia/doc/qtmultimedia.qdocconf
src/plugins/blackberry/mediaplayer/bbmetadata.cpp
src/plugins/blackberry/mediaplayer/bbmetadata.h
tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
Diffstat (limited to 'src/plugins/wmf/wmf.pro')
-rw-r--r-- | src/plugins/wmf/wmf.pro | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro index fcd2a3268..a26f319bc 100644 --- a/src/plugins/wmf/wmf.pro +++ b/src/plugins/wmf/wmf.pro @@ -1,6 +1,6 @@ TARGET = wmfengine QT += multimedia-private network -!isEmpty(QT.widgets.name) { +qtHaveModule(widgets) { QT += multimediawidgets-private DEFINES += HAVE_WIDGETS } @@ -16,14 +16,32 @@ HEADERS += \ mfstream.h \ sourceresolver.h \ samplegrabber.h \ - mftvideo.h + mftvideo.h \ + mfglobal.h \ + mfactivate.h SOURCES += \ wmfserviceplugin.cpp \ mfstream.cpp \ sourceresolver.cpp \ samplegrabber.cpp \ - mftvideo.cpp + mftvideo.cpp \ + mfactivate.cpp \ + mfglobal.cpp + +contains(QT_CONFIG, angle) { + LIBS += -ld3d9 -ldxva2 -lwinmm -levr + QT += gui-private + + HEADERS += \ + evrcustompresenter.h \ + evrd3dpresentengine.h + + SOURCES += \ + evrcustompresenter.cpp \ + evrd3dpresentengine.cpp +} + include (player/player.pri) include (decoder/decoder.pri) |