diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 07:07:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 07:07:11 (GMT) |
| commit | 2c3e72a86aa50ba788cc492754550948bd4955c9 (patch) | |
| tree | cf1eff32528b2cbc5dcc2fd1dd790587fad022a7 /src/plugins | |
| parent | ffa103af9620998f47c632f4118e789bf7f1cde7 (diff) | |
| parent | 241a51b46625222cb8633d732a1691fad6447d6e (diff) | |
| download | Qt-2c3e72a86aa50ba788cc492754550948bd4955c9.zip Qt-2c3e72a86aa50ba788cc492754550948bd4955c9.tar.gz Qt-2c3e72a86aa50ba788cc492754550948bd4955c9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Gstreamer mediaservice backend: fixed check for X11/QWS build.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/mediaservices/gstreamer/gstreamer.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/mediaservices/gstreamer/gstreamer.pro b/src/plugins/mediaservices/gstreamer/gstreamer.pro index 6af9c3f..6e05120 100644 --- a/src/plugins/mediaservices/gstreamer/gstreamer.pro +++ b/src/plugins/mediaservices/gstreamer/gstreamer.pro @@ -36,7 +36,7 @@ SOURCES += \ qvideosurfacegstsink.cpp -x11 { +!win32:!embedded:!mac:!symbian { LIBS += -lXv HEADERS += \ |