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 /modules | |
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 'modules')
-rw-r--r-- | modules/qt_multimediawidgets.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/qt_multimediawidgets.pri b/modules/qt_multimediawidgets.pri index 4dcbf4143..669a58bcb 100644 --- a/modules/qt_multimediawidgets.pri +++ b/modules/qt_multimediawidgets.pri @@ -11,7 +11,7 @@ QT.multimediawidgets.sources = $$QT_MODULE_BASE/src/multimediawidgets QT.multimediawidgets.libs = $$QT_MODULE_LIB_BASE QT.multimediawidgets.plugins = $$QT_MODULE_PLUGIN_BASE QT.multimediawidgets.imports = $$QT_MODULE_IMPORT_BASE -QT.multimediawidgets.depends = gui network +QT.multimediawidgets.depends = gui network widgets QT.multimediawidgets.DEFINES = QT_MULTIMEDIAWIDGETS_LIB QT_CONFIG += multimediawidgets |