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 /config.tests | |
parent | d5ab3ab8703ef04cc06d78983bf1a39ecfe99bb4 (diff) |
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 'config.tests')
-rw-r--r-- | config.tests/alsa/alsa.pro | 3 | ||||
-rw-r--r-- | config.tests/avfoundation/avfoundation.pro | 2 | ||||
-rw-r--r-- | config.tests/directshow/directshow.pro | 2 | ||||
-rw-r--r-- | config.tests/gstreamer/gstreamer.pro | 10 | ||||
-rw-r--r-- | config.tests/gstreamer_appsrc/gstreamer_appsrc.pro | 9 | ||||
-rw-r--r-- | config.tests/gstreamer_encodingprofiles/gstreamer_encodingprofiles.pro | 10 | ||||
-rw-r--r-- | config.tests/gstreamer_photography/gstreamer_photography.pro | 12 | ||||
-rw-r--r-- | config.tests/mmrenderer/mmrenderer.pro | 3 | ||||
-rw-r--r-- | config.tests/openal/openal.pro | 4 | ||||
-rw-r--r-- | config.tests/pulseaudio/pulseaudio.pro | 6 | ||||
-rw-r--r-- | config.tests/resourcepolicy/resourcepolicy.pro | 5 | ||||
-rw-r--r-- | config.tests/wmf/wmf.pro | 2 |
12 files changed, 0 insertions, 68 deletions
diff --git a/config.tests/alsa/alsa.pro b/config.tests/alsa/alsa.pro index 26514b788..db488fe5c 100644 --- a/config.tests/alsa/alsa.pro +++ b/config.tests/alsa/alsa.pro @@ -1,6 +1,3 @@ SOURCES = alsatest.cpp - CONFIG -= qt dylib -LIBS+=-lasound - diff --git a/config.tests/avfoundation/avfoundation.pro b/config.tests/avfoundation/avfoundation.pro index ac680d71b..9ef3afea2 100644 --- a/config.tests/avfoundation/avfoundation.pro +++ b/config.tests/avfoundation/avfoundation.pro @@ -1,3 +1 @@ OBJECTIVE_SOURCES += main.mm - -LIBS += -framework AVFoundation -framework Foundation diff --git a/config.tests/directshow/directshow.pro b/config.tests/directshow/directshow.pro index 6493e54ab..abb9ba83a 100644 --- a/config.tests/directshow/directshow.pro +++ b/config.tests/directshow/directshow.pro @@ -2,5 +2,3 @@ CONFIG -= qt CONFIG += console SOURCES += main.cpp - -LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32 diff --git a/config.tests/gstreamer/gstreamer.pro b/config.tests/gstreamer/gstreamer.pro index 6b9843ac3..3f6c64360 100644 --- a/config.tests/gstreamer/gstreamer.pro +++ b/config.tests/gstreamer/gstreamer.pro @@ -1,12 +1,2 @@ SOURCES += main.cpp -CONFIG += link_pkgconfig - -PKGCONFIG += \ - gstreamer-$$GST_VERSION \ - gstreamer-base-$$GST_VERSION \ - gstreamer-audio-$$GST_VERSION \ - gstreamer-video-$$GST_VERSION \ - gstreamer-pbutils-$$GST_VERSION - - diff --git a/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro b/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro index 0f3ca2b17..28dcadcbf 100644 --- a/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro +++ b/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro @@ -1,10 +1 @@ SOURCES += main.cpp - -CONFIG += link_pkgconfig - -PKGCONFIG += \ - gstreamer-$$GST_VERSION \ - gstreamer-base-$$GST_VERSION \ - gstreamer-audio-$$GST_VERSION \ - gstreamer-video-$$GST_VERSION \ - gstreamer-pbutils-$$GST_VERSION diff --git a/config.tests/gstreamer_encodingprofiles/gstreamer_encodingprofiles.pro b/config.tests/gstreamer_encodingprofiles/gstreamer_encodingprofiles.pro index fad40b0bd..28dcadcbf 100644 --- a/config.tests/gstreamer_encodingprofiles/gstreamer_encodingprofiles.pro +++ b/config.tests/gstreamer_encodingprofiles/gstreamer_encodingprofiles.pro @@ -1,11 +1 @@ SOURCES += main.cpp - -CONFIG += link_pkgconfig - - -PKGCONFIG += \ - gstreamer-$$GST_VERSION \ - gstreamer-base-$$GST_VERSION \ - gstreamer-audio-$$GST_VERSION \ - gstreamer-video-$$GST_VERSION \ - gstreamer-pbutils-$$GST_VERSION diff --git a/config.tests/gstreamer_photography/gstreamer_photography.pro b/config.tests/gstreamer_photography/gstreamer_photography.pro index 975991f93..28dcadcbf 100644 --- a/config.tests/gstreamer_photography/gstreamer_photography.pro +++ b/config.tests/gstreamer_photography/gstreamer_photography.pro @@ -1,13 +1 @@ SOURCES += main.cpp - -CONFIG += link_pkgconfig - -PKGCONFIG += \ - gstreamer-$$GST_VERSION \ - gstreamer-base-$$GST_VERSION \ - gstreamer-audio-$$GST_VERSION \ - gstreamer-video-$$GST_VERSION \ - gstreamer-pbutils-$$GST_VERSION - -LIBS += -lgstphotography-$$GST_VERSION - diff --git a/config.tests/mmrenderer/mmrenderer.pro b/config.tests/mmrenderer/mmrenderer.pro index cc1e21e82..571b51627 100644 --- a/config.tests/mmrenderer/mmrenderer.pro +++ b/config.tests/mmrenderer/mmrenderer.pro @@ -1,6 +1,3 @@ SOURCES = mmrenderertest.cpp - CONFIG -= qt -LIBS += -lmmrndclient -lstrm - diff --git a/config.tests/openal/openal.pro b/config.tests/openal/openal.pro index a4a7d1e86..1aa1271c6 100644 --- a/config.tests/openal/openal.pro +++ b/config.tests/openal/openal.pro @@ -1,7 +1,3 @@ SOURCES += main.cpp -win32: LIBS += -lOpenAL32 -unix:!mac:!blackberry: LIBS += -lopenal -blackberry: LIBS += -lOpenAL -mac: LIBS += -framework OpenAL mac: DEFINES += HEADER_OPENAL_PREFIX diff --git a/config.tests/pulseaudio/pulseaudio.pro b/config.tests/pulseaudio/pulseaudio.pro index 12ad7fba2..ff7082390 100644 --- a/config.tests/pulseaudio/pulseaudio.pro +++ b/config.tests/pulseaudio/pulseaudio.pro @@ -1,8 +1,2 @@ CONFIG -= qt -CONFIG += link_pkgconfig - -PKGCONFIG += \ - libpulse \ - libpulse-mainloop-glib - SOURCES = pulseaudio.cpp diff --git a/config.tests/resourcepolicy/resourcepolicy.pro b/config.tests/resourcepolicy/resourcepolicy.pro index 7627d4805..3f6c64360 100644 --- a/config.tests/resourcepolicy/resourcepolicy.pro +++ b/config.tests/resourcepolicy/resourcepolicy.pro @@ -1,7 +1,2 @@ SOURCES += main.cpp -CONFIG += link_pkgconfig - -PKGCONFIG += \ - libresourceqt5 - diff --git a/config.tests/wmf/wmf.pro b/config.tests/wmf/wmf.pro index ac5643e4f..abb9ba83a 100644 --- a/config.tests/wmf/wmf.pro +++ b/config.tests/wmf/wmf.pro @@ -2,5 +2,3 @@ CONFIG -= qt CONFIG += console SOURCES += main.cpp - -LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32 -lMf -lMfuuid -lMfplat -lPropsys |