From 82ade38b11071b2208ea1d18f0da27d36f877d8d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 5 Apr 2012 14:29:09 +0200 Subject: switch to new-style configure tests Change-Id: Ib56d0cb24065c1f990aee5d7f41bfedfe75332a1 Reviewed-by: Joerg Bornemann --- config.tests/alsa/alsa.pro | 3 --- config.tests/directshow/directshow.pro | 2 -- config.tests/evr/evr.pro | 2 -- config.tests/gstreamer/gstreamer.pro | 2 -- config.tests/gstreamer_appsrc/gstreamer_appsrc.pro | 2 -- .../gstreamer_photography/gstreamer_photography.pro | 2 -- config.tests/pulseaudio/pulseaudio.pro | 2 -- config.tests/resourcepolicy/resourcepolicy.pro | 2 -- config.tests/wmp/wmp.pro | 2 -- config.tests/wmsdk/wmsdk.pro | 2 -- config.tests/xvideo/xvideo.pro | 2 -- examples/examples.pro | 2 +- qtmultimedia.pro | 19 +++++++++++++++++++ src/gsttools/gsttools.pro | 6 +++--- src/imports/imports.pro | 2 +- src/multimedia/audio/audio.pri | 4 ++-- src/plugins/directshow/directshow.pro | 4 ++-- src/plugins/gstreamer/common.pri | 6 +++--- src/plugins/gstreamer/gstreamer.pro | 2 +- src/plugins/plugins.pro | 8 ++++---- src/src.pro | 2 +- sync.profile | 20 -------------------- 22 files changed, 37 insertions(+), 61 deletions(-) diff --git a/config.tests/alsa/alsa.pro b/config.tests/alsa/alsa.pro index 00f238650..30319f816 100644 --- a/config.tests/alsa/alsa.pro +++ b/config.tests/alsa/alsa.pro @@ -2,12 +2,9 @@ TEMPLATE = app DEPENDPATH += . INCLUDEPATH += . -requires(unix) - SOURCES = alsatest.cpp CONFIG -= qt dylib -mac:CONFIG -= app_bundle LIBS+=-lasound diff --git a/config.tests/directshow/directshow.pro b/config.tests/directshow/directshow.pro index bbf88043d..6493e54ab 100644 --- a/config.tests/directshow/directshow.pro +++ b/config.tests/directshow/directshow.pro @@ -1,8 +1,6 @@ CONFIG -= qt CONFIG += console -requires(win32*) - SOURCES += main.cpp LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32 diff --git a/config.tests/evr/evr.pro b/config.tests/evr/evr.pro index 54cf30f1b..abb9ba83a 100644 --- a/config.tests/evr/evr.pro +++ b/config.tests/evr/evr.pro @@ -1,6 +1,4 @@ CONFIG -= qt CONFIG += console -requires(win32*) - SOURCES += main.cpp diff --git a/config.tests/gstreamer/gstreamer.pro b/config.tests/gstreamer/gstreamer.pro index 5076db083..02a7e3406 100644 --- a/config.tests/gstreamer/gstreamer.pro +++ b/config.tests/gstreamer/gstreamer.pro @@ -1,5 +1,3 @@ -requires(unix) - SOURCES += main.cpp CONFIG += link_pkgconfig diff --git a/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro b/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro index 2d77a00b5..9f6170368 100644 --- a/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro +++ b/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro @@ -1,5 +1,3 @@ -requires(unix) - SOURCES += main.cpp CONFIG += link_pkgconfig diff --git a/config.tests/gstreamer_photography/gstreamer_photography.pro b/config.tests/gstreamer_photography/gstreamer_photography.pro index 951e0abcb..6b530cb78 100644 --- a/config.tests/gstreamer_photography/gstreamer_photography.pro +++ b/config.tests/gstreamer_photography/gstreamer_photography.pro @@ -1,5 +1,3 @@ -requires(unix) - SOURCES += main.cpp CONFIG += link_pkgconfig diff --git a/config.tests/pulseaudio/pulseaudio.pro b/config.tests/pulseaudio/pulseaudio.pro index 3dd769fdd..a6e03394d 100644 --- a/config.tests/pulseaudio/pulseaudio.pro +++ b/config.tests/pulseaudio/pulseaudio.pro @@ -2,8 +2,6 @@ CONFIG -= qt LIBS += CONFIG += link_pkgconfig -requires(unix) - PKGCONFIG += \ libpulse \ libpulse-mainloop-glib diff --git a/config.tests/resourcepolicy/resourcepolicy.pro b/config.tests/resourcepolicy/resourcepolicy.pro index 4b4b3c8f4..9dddaa966 100644 --- a/config.tests/resourcepolicy/resourcepolicy.pro +++ b/config.tests/resourcepolicy/resourcepolicy.pro @@ -1,5 +1,3 @@ -requires(unix) - SOURCES += main.cpp CONFIG += link_pkgconfig diff --git a/config.tests/wmp/wmp.pro b/config.tests/wmp/wmp.pro index dc6a9cec4..b16509cc4 100644 --- a/config.tests/wmp/wmp.pro +++ b/config.tests/wmp/wmp.pro @@ -1,8 +1,6 @@ CONFIG -= qt CONFIG += console -requires(win32*) - SOURCES += main.cpp LIBS += -lstrmiids -lole32 -lOleaut32 -luser32 -lgdi32 diff --git a/config.tests/wmsdk/wmsdk.pro b/config.tests/wmsdk/wmsdk.pro index 54cf30f1b..abb9ba83a 100644 --- a/config.tests/wmsdk/wmsdk.pro +++ b/config.tests/wmsdk/wmsdk.pro @@ -1,6 +1,4 @@ CONFIG -= qt CONFIG += console -requires(win32*) - SOURCES += main.cpp diff --git a/config.tests/xvideo/xvideo.pro b/config.tests/xvideo/xvideo.pro index 056dd0a33..69326e5b1 100644 --- a/config.tests/xvideo/xvideo.pro +++ b/config.tests/xvideo/xvideo.pro @@ -1,5 +1,3 @@ -requires(unix) - SOURCES += main.cpp CONFIG += link_pkgconfig diff --git a/examples/examples.pro b/examples/examples.pro index a98c082e3..92e530ad5 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -25,4 +25,4 @@ TEMPLATE = subdirs QT += widgets } -contains(config_test_openal, yes): SUBDIRS += audioengine +config_openal: SUBDIRS += audioengine diff --git a/qtmultimedia.pro b/qtmultimedia.pro index cb1452bf1..4d3a71cef 100644 --- a/qtmultimedia.pro +++ b/qtmultimedia.pro @@ -1,3 +1,22 @@ +load(configure) +qtCompileTest(openal) +win32 { + qtCompileTest(directshow) + qtCompileTest(wmsdk) + qtCompileTest(wmp) + qtCompileTest(wmf) + qtCompileTest(evr) +} else { + qtCompileTest(alsa) + qtCompileTest(pulsaudio) + qtCompileTest(gstreamer) { + qtCompileTest(gstreamer_photography) + qtCompileTest(gstreamer_appsrc) + } + qtCompileTest(resourcepolicy) + qtCompileTest(xvideo) +} + TEMPLATE = subdirs module_qtmultimedia_src.subdir = src diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro index c62d68970..50e546584 100644 --- a/src/gsttools/gsttools.pro +++ b/src/gsttools/gsttools.pro @@ -24,7 +24,7 @@ PKGCONFIG += \ maemo*:PKGCONFIG +=gstreamer-plugins-bad-0.10 -contains(config_test_resourcepolicy, yes) { +config_resourcepolicy { DEFINES += HAVE_RESOURCE_POLICY PKGCONFIG += libresourceqt1 } @@ -66,7 +66,7 @@ SOURCES += \ qgstreamervideoprobecontrol.cpp \ qgstreameraudioprobecontrol.cpp \ -contains(config_test_xvideo, yes) { +config_xvideo { DEFINES += HAVE_XVIDEO LIBS += -lXv -lX11 -lXext @@ -105,7 +105,7 @@ maemo6 { } } -contains(config_test_gstreamer_appsrc, yes) { +config_gstreamer_appsrc { PKGCONFIG += gstreamer-app-0.10 PRIVATE_HEADERS += qgstappsrc_p.h SOURCES += qgstappsrc.cpp diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 443940739..d24bba59f 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs SUBDIRS += multimedia -contains(config_test_openal, yes): SUBDIRS += audioengine +config_openal: SUBDIRS += audioengine diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/audio/audio.pri index fedfc97cd..d081990d2 100644 --- a/src/multimedia/audio/audio.pri +++ b/src/multimedia/audio/audio.pri @@ -60,7 +60,7 @@ win32 { } unix:!mac { - contains(config_test_pulseaudio, yes) { + config_pulseaudio { DEFINES += QT_NO_AUDIO_BACKEND CONFIG += link_pkgconfig PKGCONFIG += libpulse @@ -74,7 +74,7 @@ unix:!mac { PRIVATE_HEADERS += audio/qsoundeffect_qmedia_p.h SOURCES += audio/qsoundeffect_qmedia_p.cpp - contains(config_test_alsa, yes):linux-*|freebsd-*|openbsd-* { + config_alsa:linux-*|freebsd-*|openbsd-* { DEFINES += HAS_ALSA PRIVATE_HEADERS += audio/qaudiooutput_alsa_p.h audio/qaudioinput_alsa_p.h audio/qaudiodeviceinfo_alsa_p.h SOURCES += audio/qaudiodeviceinfo_alsa_p.cpp \ diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index fe1cf5feb..02af790c2 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -12,14 +12,14 @@ DEPENDPATH += . HEADERS += dsserviceplugin.h SOURCES += dsserviceplugin.cpp -!contains(config_test_wmsdk, yes): DEFINES += QT_NO_WMSDK +!config_wmsdk: DEFINES += QT_NO_WMSDK !isEmpty(QT.widgets.name) { QT += multimediawidgets DEFINES += HAVE_WIDGETS } -contains(config_test_wmf, no): include(player/player.pri) +!config_wmf: include(player/player.pri) include(camera/camera.pri) target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} diff --git a/src/plugins/gstreamer/common.pri b/src/plugins/gstreamer/common.pri index 582b79a6c..c9a3fb661 100644 --- a/src/plugins/gstreamer/common.pri +++ b/src/plugins/gstreamer/common.pri @@ -21,17 +21,17 @@ PKGCONFIG += \ maemo*:PKGCONFIG +=gstreamer-plugins-bad-0.10 -contains(config_test_resourcepolicy, yes) { +config_resourcepolicy { DEFINES += HAVE_RESOURCE_POLICY PKGCONFIG += libresourceqt1 } -contains(config_test_xvideo, yes):!isEmpty(QT.widgets.name): { +config_xvideo:!isEmpty(QT.widgets.name): { DEFINES += HAVE_XVIDEO LIBS += -lXv -lX11 -lXext } -contains(config_test_gstreamer_appsrc, yes) { +config_gstreamer_appsrc { PKGCONFIG += gstreamer-app-0.10 DEFINES += HAVE_GST_APPSRC LIBS += -lgstapp-0.10 diff --git a/src/plugins/gstreamer/gstreamer.pro b/src/plugins/gstreamer/gstreamer.pro index caa79c764..63f2c643b 100644 --- a/src/plugins/gstreamer/gstreamer.pro +++ b/src/plugins/gstreamer/gstreamer.pro @@ -7,7 +7,7 @@ SUBDIRS += \ # Camerabin2 based camera backend is untested and currently disabled disabled { - contains(config_test_gstreamer_photography, yes) { + config_gstreamer_photography { SUBDIRS += camerabin } } diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 9f94c5f86..7d24ec78c 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -13,12 +13,12 @@ win32 { } win32 { - contains(config_test_directshow, yes): SUBDIRS += directshow - contains(config_test_wmf, yes) : SUBDIRS += wmf + config_directshow: SUBDIRS += directshow + config_wmf: SUBDIRS += wmf } unix:!mac { - contains(config_test_gstreamer, yes) { + config_gstreamer { SUBDIRS += gstreamer } else { SUBDIRS += audiocapture @@ -27,7 +27,7 @@ unix:!mac { # v4l is turned off because it is not supported in Qt 5 # !maemo*:SUBDIRS += v4l - contains(config_test_pulseaudio, yes) { + config_pulseaudio { SUBDIRS += pulseaudio } } diff --git a/src/src.pro b/src/src.pro index 02f97f185..848088826 100644 --- a/src/src.pro +++ b/src/src.pro @@ -33,7 +33,7 @@ SUBDIRS += \ src_qgsttools.depends += src_qtmmwidgets } -contains(config_test_gstreamer, yes) { +config_gstreamer { SUBDIRS += src_qgsttools # If gstreamer is present, then plugins should depend on it diff --git a/sync.profile b/sync.profile index bd11bf899..6d0d41005 100644 --- a/sync.profile +++ b/sync.profile @@ -29,23 +29,3 @@ "qtdeclarative" => "refs/heads/master", "qtjsbackend" => "refs/heads/master", ); -# Compile tests -%configtests = ( - # Windows tests - "directshow" => {}, - "wmsdk" => {}, - "wmp" => {}, - "wmf" => {}, - "evr" => {}, - - # Linux tests - "alsa" => {}, - "gstreamer" => {}, - "gstreamer_photography" => {}, - "gstreamer_appsrc" => {}, - "pulseaudio" => {}, - "resourcepolicy" => {}, - "xvideo" => {}, - - "openal" => {}, -); -- cgit v1.2.3