diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-25 11:46:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-25 11:46:41 (GMT) |
| commit | 8928e37c8b1b375e74c5981915c034123de11b3d (patch) | |
| tree | 0dfa96087ca129f25d2e59265f73a046d75d274f /src/plugins/mediaservices | |
| parent | ef30a6f336d55c813423bf139d8363f50181179f (diff) | |
| parent | 9e20aac8d44a0e3e3ac4c5d67376f50071987b91 (diff) | |
| download | Qt-8928e37c8b1b375e74c5981915c034123de11b3d.zip Qt-8928e37c8b1b375e74c5981915c034123de11b3d.tar.gz Qt-8928e37c8b1b375e74c5981915c034123de11b3d.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (54 commits)
Better check in QStaticText testcase if xformed text is supported
Fix point drawing in QPainter.
Expand indicator would not be displayed after removal of a collapsed item's child
Avoid always detaching QStaticText
Doc: fix formatting
Make the qpainter test compile under Windows.
make QtScript compatible with mingw 64
Fix QStaticText test on QWS
Add licence header
Fixed a warning.
WinCE compilation fix
Fixed hypersensitive drag on QHeaderViews
Fix seg-fault when no X11 desktop environment is present
Remove comment in drawStaticTextItem() in GL engine
Separate Phonon and gstreamer defines in qtconfig
Revert "Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ( 5381ceeb37d97365cfb2f037650dbb4e495bca4e )"
Revert "Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ( 9303f6d67fb964b71ed3e7361367c3ccfaba5e0a )"
Fix compilation on Windows
Compile with QT_USE_FAST_OPERATOR_PLUS
Fix compilation error in openVG
...
Diffstat (limited to 'src/plugins/mediaservices')
| -rw-r--r-- | src/plugins/mediaservices/gstreamer/gstreamer.pro | 12 | ||||
| -rw-r--r-- | src/plugins/mediaservices/mediaservices.pro | 13 |
2 files changed, 4 insertions, 21 deletions
diff --git a/src/plugins/mediaservices/gstreamer/gstreamer.pro b/src/plugins/mediaservices/gstreamer/gstreamer.pro index db0ee4e..22e3c16 100644 --- a/src/plugins/mediaservices/gstreamer/gstreamer.pro +++ b/src/plugins/mediaservices/gstreamer/gstreamer.pro @@ -8,16 +8,8 @@ unix:contains(QT_CONFIG, alsa) { LIBS += -lasound } -LIBS += -lXv - -CONFIG += link_pkgconfig - -PKGCONFIG += \ - gstreamer-0.10 \ - gstreamer-base-0.10 \ - gstreamer-interfaces-0.10 \ - gstreamer-audio-0.10 \ - gstreamer-video-0.10 +QMAKE_CXXFLAGS += $$QT_CFLAGS_GSTREAMER +LIBS += -lXv $$QT_LIBS_GSTREAMER -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10 -lgstaudio-0.10 # Input HEADERS += \ diff --git a/src/plugins/mediaservices/mediaservices.pro b/src/plugins/mediaservices/mediaservices.pro index 0cef605..d84b276 100644 --- a/src/plugins/mediaservices/mediaservices.pro +++ b/src/plugins/mediaservices/mediaservices.pro @@ -5,16 +5,7 @@ contains(QT_CONFIG, mediaservice) { mac: SUBDIRS += qt7 - unix:!mac:!symbian { - TMP_GST_LIBS = \ - gstreamer-0.10 >= 0.10.19 \ - gstreamer-base-0.10 >= 0.10.19 \ - gstreamer-interfaces-0.10 >= 0.10.19 \ - gstreamer-audio-0.10 >= 0.10.19 \ - gstreamer-video-0.10 >= 0.10.19 - - system(pkg-config --exists \'$${TMP_GST_LIBS}\' --print-errors): { - SUBDIRS += gstreamer - } + unix:!mac:!symbian:contains(QT_CONFIG, xvideo):contains(QT_CONFIG, gstreamer) { + SUBDIRS += gstreamer } } |