diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-01-05 17:22:19 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-06 05:26:01 +0100 |
| commit | c97f5f8c2e91c1b76d42583efaf232487d490060 (patch) | |
| tree | 533f1142282ebce38bbf7bd4356b4341530f30be /src/plugins/directshow/directshow.pro | |
| parent | bc7d964a053a3a37a0b286ee17ee15c9ef747c3e (diff) | |
| download | qtmultimedia-c97f5f8c2e91c1b76d42583efaf232487d490060.tar.gz | |
Properly handle the case where QtWidgets is not available.
It does use a config test for now, just to make it clearer. The Mac
backend currently requires widgets, but most of the others should work
without it (just not supporting QVideoWidget/WindowControl).
The QVideoDeviceControl interface was modified to remove the QIcon
usage - it was never implemented.
Unfortunately even the QML examples need widgets for the wrapper
application, and will need to be ported to QtGui based wrapper.
Change-Id: I8a55ad5cf09ab51749510bf16f49de0bd3f0bcdb
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'src/plugins/directshow/directshow.pro')
| -rw-r--r-- | src/plugins/directshow/directshow.pro | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index 80d588fd9..e027a2c7e 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -5,8 +5,6 @@ TARGET = $$qtLibraryTarget(dsengine) PLUGIN_TYPE=mediaservice -include (../../../common.pri) - QT += multimedia DEPENDPATH += . @@ -16,8 +14,13 @@ SOURCES += dsserviceplugin.cpp !contains(config_test_wmsdk, yes): DEFINES += QT_NO_WMSDK -contains(config_test_wmf, no): include (player/player.pri) -include (camera/camera.pri) +contains(config_test_widgets, yes) { + QT += multimediawidgets + DEFINES += HAVE_WIDGETS +} + +contains(config_test_wmf, no): include(player/player.pri) +include(camera/camera.pri) target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} INSTALLS += target |