diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-19 17:14:43 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-19 17:15:56 +0100 |
commit | d396262bc9771cacbc71e79215768984fa1974ff (patch) | |
tree | e029399524feabed6ebe0ee1e010af9f5e58932d /src/plugins/gstreamer/common.pri | |
parent | 0ce2cb3ebe6289e3db14438560fa186d9e5186b8 (diff) | |
parent | 2db2cde0d8433ad1aed59412717c4cddf496ba66 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/multimedia/doc/qtmultimedia.qdocconf
src/plugins/blackberry/mediaplayer/bbmetadata.cpp
src/plugins/blackberry/mediaplayer/bbmetadata.h
tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
Diffstat (limited to 'src/plugins/gstreamer/common.pri')
-rw-r--r-- | src/plugins/gstreamer/common.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/gstreamer/common.pri b/src/plugins/gstreamer/common.pri index c9a3fb661..91086576f 100644 --- a/src/plugins/gstreamer/common.pri +++ b/src/plugins/gstreamer/common.pri @@ -2,7 +2,7 @@ QT += multimedia-private network CONFIG += no_private_qt_headers_warning -!isEmpty(QT.widgets.name) { +qtHaveModule(widgets) { QT += widgets multimediawidgets-private DEFINES += HAVE_WIDGETS } @@ -26,7 +26,7 @@ config_resourcepolicy { PKGCONFIG += libresourceqt1 } -config_xvideo:!isEmpty(QT.widgets.name): { +config_xvideo:qtHaveModule(widgets) { DEFINES += HAVE_XVIDEO LIBS += -lXv -lX11 -lXext } |