diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-10-26 16:15:20 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-11-14 17:03:21 +0000 |
| commit | f0ea26416a73e9ed60e0e0440275e73081f601a2 (patch) | |
| tree | fc757ae3e14e32be4bd4bcd3629d79527308907a /src/gsttools | |
| parent | d5ab3ab8703ef04cc06d78983bf1a39ecfe99bb4 (diff) | |
| download | qtmultimedia-f0ea26416a73e9ed60e0e0440275e73081f601a2.tar.gz | |
Move qtmultimedia over to the new config system
Use the new configuration system to define external
libraries, configure tests and features. Don't use
pkg-config outside of the configuration step. And
move all command line options over from qtbase, so
that we can remove them from there in a second step.
Change-Id: I1aa4b557a6aee17eeceb00602005a2d28b426a26
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/gsttools')
| -rw-r--r-- | src/gsttools/gsttools.pro | 40 |
1 files changed, 12 insertions, 28 deletions
diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro index 216189d9a..3f955c185 100644 --- a/src/gsttools/gsttools.pro +++ b/src/gsttools/gsttools.pro @@ -8,29 +8,16 @@ QT = core-private multimedia-private gui-private !static:DEFINES += QT_MAKEDLL DEFINES += GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 -unix:!maemo*:contains(QT_CONFIG, alsa) { -DEFINES += HAVE_ALSA -LIBS_PRIVATE += \ - -lasound +qtConfig(alsa) { + DEFINES += HAVE_ALSA + QMAKE_USE += alsa } -CONFIG += link_pkgconfig +QMAKE_USE += gstreamer -PKGCONFIG += \ - gstreamer-$$GST_VERSION \ - gstreamer-base-$$GST_VERSION \ - gstreamer-audio-$$GST_VERSION \ - gstreamer-video-$$GST_VERSION \ - gstreamer-pbutils-$$GST_VERSION - -equals(GST_VERSION,"0.10") { - PKGCONFIG_PRIVATE += gstreamer-interfaces-0.10 - maemo*: PKGCONFIG_PRIVATE +=gstreamer-plugins-bad-0.10 -} - -config_resourcepolicy { +qtConfig(resourcepolicy) { DEFINES += HAVE_RESOURCE_POLICY - PKGCONFIG_PRIVATE += libresourceqt5 + QMAKE_USE += libresourceqt5 } # Header files must go inside source directory of a module @@ -44,7 +31,6 @@ PRIVATE_HEADERS += \ qgstreamermessage_p.h \ qgstutils_p.h \ qgstvideobuffer_p.h \ - qvideosurfacegstsink_p.h \ qgstreamerbufferprobe_p.h \ qgstreamervideorendererinterface_p.h \ qgstreameraudioinputselector_p.h \ @@ -82,10 +68,11 @@ qtHaveModule(widgets) { qgstreamervideowidget.cpp } -equals(GST_VERSION,"0.10") { +qtConfig(gstreamer_0_10) { PRIVATE_HEADERS += \ qgstbufferpoolinterface_p.h \ - gstvideoconnector_p.h \ + qvideosurfacegstsink_p.h \ + gstvideoconnector_p.h SOURCES += \ qgstbufferpoolinterface.cpp \ @@ -122,17 +109,14 @@ mir: { DEFINES += HAVE_MIR } -config_gstreamer_appsrc { - PKGCONFIG_PRIVATE += gstreamer-app-$$GST_VERSION +qtConfig(gstreamer_app) { + QMAKE_USE += gstreamer_app PRIVATE_HEADERS += qgstappsrc_p.h SOURCES += qgstappsrc.cpp - DEFINES += HAVE_GST_APPSRC - - LIBS_PRIVATE += -lgstapp-$$GST_VERSION } -config_linux_v4l: DEFINES += USE_V4L +qtConfig(linux_v4l): DEFINES += USE_V4L HEADERS += $$PRIVATE_HEADERS |