diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-01-09 16:59:54 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-11 01:00:42 +0100 |
| commit | f7bfcdfa288b4d85adc5649fd7e4f97d42357e7f (patch) | |
| tree | c07765ddbdb6635db4ff9d35f3109238ad3b565e /src/plugins/gstreamer | |
| parent | 23470c20355c8e7911be5a10355852c4cb921f76 (diff) | |
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>
Diffstat (limited to 'src/plugins/gstreamer')
| -rw-r--r-- | src/plugins/gstreamer/gstreamer.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/gstreamer/gstreamer.pro b/src/plugins/gstreamer/gstreamer.pro index 137b61c55..6f4d43b9e 100644 --- a/src/plugins/gstreamer/gstreamer.pro +++ b/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 |