From c97f5f8c2e91c1b76d42583efaf232487d490060 Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Thu, 5 Jan 2012 17:22:19 +1000 Subject: 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 --- src/plugins/plugins.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/plugins/plugins.pro') diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 8f12a13ed..0317d7d13 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -36,6 +36,9 @@ unix:!mac { mac:!simulator { SUBDIRS += audiocapture - SUBDIRS += qt7 + + # Currently we need qmacdefines_mac.h from QtWidgets, so this depends on that :/ + # despite the code not really using them. + contains(config_test_widgets, yes):SUBDIRS += qt7 } -- cgit v1.2.3