Remove widgets config test.

Since it's not guaranteed that other Qt modules will be built by the
time qmake is run (and config.tests are created) we can't rely on
compilation.  Just check the module.pri variable for widgets instead.

Change-Id: I352cf6427b748b89b69ec17588ce0dd83065090f
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

src/plugins/directshow/camera/camera.pri

@@ -24,7 +24,7 @@ SOURCES += \
     $$PWD/dsimagecapturecontrol.cpp \
     $$PWD/dscamerasession.cpp
 
-contains(config_test_widgets, yes) {
+!isEmpty(QT.widgets.name) {
     HEADERS += $$PWD/dsvideowidgetcontrol.h
     SOURCES += $$PWD/dsvideowidgetcontrol.cpp
 }

src/plugins/directshow/directshow.pro

@@ -14,7 +14,7 @@ SOURCES += dsserviceplugin.cpp
 
 !contains(config_test_wmsdk, yes): DEFINES += QT_NO_WMSDK
 
-contains(config_test_widgets, yes) {
+!isEmpty(QT.widgets.name) {
     QT += multimediawidgets
     DEFINES += HAVE_WIDGETS
 }

src/plugins/directshow/player/player.pri

@@ -35,7 +35,7 @@ SOURCES += \
         $$PWD/mediasamplevideobuffer.cpp \
         $$PWD/videosurfacefilter.cpp
 
-contains(config_test_widgets, yes):!simulator {
+!isEmpty(QT.widgets.name):!simulator {
     HEADERS += \
         $$PWD/vmr9videowindowcontrol.h
 

src/plugins/gstreamer/gstreamer.pro

@@ -5,7 +5,7 @@ TARGET = qgstengine
 QT += multimedia-private network
 CONFIG += no_private_qt_headers_warning
 
-contains(config_test_widgets, yes) {
+!isEmpty(QT.widgets.name) {
     QT += widgets multimediawidgets-private
     DEFINES += HAVE_WIDGETS
 }
@@ -46,7 +46,7 @@ maemo6 {
 
     PKGCONFIG += qmsystem2
 
-    isEqual(QT_ARCH,armv6):contains(config_test_widgets, yes) {
+    isEqual(QT_ARCH,armv6):!isEmpty(QT.widgets.name) {
         HEADERS += qgstreamergltexturerenderer.h
         SOURCES += qgstreamergltexturerenderer.cpp
         QT += opengl
@@ -74,7 +74,7 @@ SOURCES += \
     gstvideoconnector.c \
 
 
-contains(config_test_xvideo, yes):contains(config_test_widgets, yes): {
+contains(config_test_xvideo, yes):!isEmpty(QT.widgets.name): {
     DEFINES += HAVE_XVIDEO
 
     LIBS += -lXv -lX11 -lXext

src/plugins/plugins.pro

@@ -39,6 +39,6 @@ mac:!simulator {
 
     # 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
+    !isEmpty(QT.widgets.name):SUBDIRS += qt7
 }
 

src/plugins/qt7/qt7.pro

@@ -2,7 +2,7 @@ load(qt_module)
 
 TARGET = qqt7engine
 QT += multimedia-private network
-contains(config_test_widgets, yes) {
+!isEmpty(QT.widgets.name) {
     QT += multimediawidgets-private widgets
 }
 
@@ -56,9 +56,9 @@ OBJECTIVE_SOURCES += \
         qt7ciimagevideobuffer.mm \
         qcvdisplaylink.mm
 
-    contains(config_test_widgets, yes) {
+    !isEmpty(QT.widgets.name) {
         HEADERS += \
-            qt7movieviewwidget.h
+            qt7movievideowidget.h
 
         OBJECTIVE_SOURCES += \
             qt7movievideowidget.mm

src/plugins/wmf/player/player.pri

@@ -24,7 +24,7 @@ SOURCES += \
     $$PWD/mfaudioendpointcontrol.cpp \
     $$PWD/mfmetadatacontrol.cpp
 
-contains(config_test_widgets, yes):!simulator {
+!isEmpty(QT.widgets.name):!simulator {
     HEADERS += $$PWD/evr9videowindowcontrol.h
     SOURCES += $$PWD/evr9videowindowcontrol.cpp
 }

src/plugins/wmf/wmf.pro

@@ -2,7 +2,7 @@ load(qt_module)
 
 TARGET = wmfengine
 QT += multimedia-private network
-contains(config_test_widgets, yes) {
+!isEmpty(QT.widgets.name) {
     QT += multimediawidgets-private
     DEFINES += HAVE_WIDGETS
 }