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/src.pro | |
| parent | bc7d964a053a3a37a0b286ee17ee15c9ef747c3e (diff) | |
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/src.pro')
| -rw-r--r-- | src/src.pro | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/src/src.pro b/src/src.pro index f29fb118a..14b6c7072 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,19 +1,30 @@ TEMPLATE = subdirs -CONFIG += ordered -library_qgsttools.subdir = $$IN_PWD/gsttools -library_qgsttools.depends = multimedia +SUBDIRS += multimedia -library_qtmmwidgets.subdir = $$IN_PWD/multimediawidgets -library_qtmmwidgets.depends = multimedia +# Everything else depends on multimedia +src_qgsttools.subdir = $$IN_PWD/gsttools +src_qgsttools.depends = multimedia -SUBDIRS += multimedia +src_qtmmwidgets.subdir = $$IN_PWD/multimediawidgets +src_qtmmwidgets.depends = multimedia + +src_plugins.subdir = $$IN_PWD/plugins +src_plugins.depends = multimedia + +src_imports.subdir = $$IN_PWD/imports +src_imports.depends = multimedia + +SUBDIRS += src_imports + +# Optional bits +contains(config_test_gstreamer, yes):SUBDIRS += src_qgsttools +contains(config_test_widgets, yes) { + SUBDIRS += src_qtmmwidgets -contains(config_test_gstreamer, yes) { - SUBDIRS += library_qgsttools + # If widgets is around, plugins depends on widgets too (imports does not) + src_plugins.depends += src_qtmmwidgets } -SUBDIRS += library_qtmmwidgets -SUBDIRS += imports -SUBDIRS += plugins +SUBDIRS += src_plugins |