diff options
16 files changed, 37 insertions, 11 deletions
diff --git a/config.tests/directshow/directshow.pro b/config.tests/directshow/directshow.pro index 526519851..0ad9cb763 100644 --- a/config.tests/directshow/directshow.pro +++ b/config.tests/directshow/directshow.pro @@ -2,6 +2,8 @@ CONFIG -= qt CONFIG += console TEMPLATE = app +requires(win32*) + # Input SOURCES += main.cpp diff --git a/config.tests/evr/evr.pro b/config.tests/evr/evr.pro index bbdad3ffe..c15b6c8c4 100644 --- a/config.tests/evr/evr.pro +++ b/config.tests/evr/evr.pro @@ -2,5 +2,7 @@ CONFIG -= qt CONFIG += console TEMPLATE = app +requires(win32*) + # Input SOURCES += main.cpp diff --git a/config.tests/gstreamer-appsrc/gstreamer-appsrc.pro b/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro index 6c003e4d9..b0a6efc01 100644 --- a/config.tests/gstreamer-appsrc/gstreamer-appsrc.pro +++ b/config.tests/gstreamer_appsrc/gstreamer_appsrc.pro @@ -1,8 +1,9 @@ TEMPLATE = app -TARGET = DEPENDPATH += . INCLUDEPATH += . +requires(unix) + # Input SOURCES += main.cpp diff --git a/config.tests/gstreamer-appsrc/main.cpp b/config.tests/gstreamer_appsrc/main.cpp index 7182fd3d0..7182fd3d0 100644 --- a/config.tests/gstreamer-appsrc/main.cpp +++ b/config.tests/gstreamer_appsrc/main.cpp diff --git a/config.tests/gstreamer-photography/gstreamer-photography.pro b/config.tests/gstreamer_photography/gstreamer_photography.pro index e2b530286..c0d995227 100644 --- a/config.tests/gstreamer-photography/gstreamer-photography.pro +++ b/config.tests/gstreamer_photography/gstreamer_photography.pro @@ -1,8 +1,9 @@ TEMPLATE = app -TARGET = DEPENDPATH += . INCLUDEPATH += . +requires(unix) + # Input SOURCES += main.cpp diff --git a/config.tests/gstreamer-photography/main.cpp b/config.tests/gstreamer_photography/main.cpp index 677ee68cb..677ee68cb 100644 --- a/config.tests/gstreamer-photography/main.cpp +++ b/config.tests/gstreamer_photography/main.cpp diff --git a/config.tests/pulseaudio/pulseaudio.pro b/config.tests/pulseaudio/pulseaudio.pro index 6f121fed7..3dd769fdd 100644 --- a/config.tests/pulseaudio/pulseaudio.pro +++ b/config.tests/pulseaudio/pulseaudio.pro @@ -1,8 +1,11 @@ -SOURCES = pulseaudio.cpp CONFIG -= qt LIBS += CONFIG += link_pkgconfig +requires(unix) + PKGCONFIG += \ libpulse \ libpulse-mainloop-glib + +SOURCES = pulseaudio.cpp diff --git a/config.tests/wmp/wmp.pro b/config.tests/wmp/wmp.pro index b00754e59..4c2f1578b 100644 --- a/config.tests/wmp/wmp.pro +++ b/config.tests/wmp/wmp.pro @@ -2,6 +2,8 @@ CONFIG -= qt CONFIG += console TEMPLATE = app +requires(win32*) + # Input SOURCES += main.cpp diff --git a/config.tests/wmsdk/wmsdk.pro b/config.tests/wmsdk/wmsdk.pro index bbdad3ffe..c15b6c8c4 100644 --- a/config.tests/wmsdk/wmsdk.pro +++ b/config.tests/wmsdk/wmsdk.pro @@ -2,5 +2,7 @@ CONFIG -= qt CONFIG += console TEMPLATE = app +requires(win32*) + # Input SOURCES += main.cpp diff --git a/src/multimediakit/audio/audio.pri b/src/multimediakit/audio/audio.pri index 799d6a05b..4bedbd4d5 100644 --- a/src/multimediakit/audio/audio.pri +++ b/src/multimediakit/audio/audio.pri @@ -44,7 +44,7 @@ win32 { } unix:!mac { - contains(pulseaudio_enabled, yes) { + contains(config_test_pulseaudio, yes) { DEFINES += QT_NO_AUDIO_BACKEND } else:contains(QT_CONFIG, alsa) { diff --git a/src/multimediakit/effects/effects.pri b/src/multimediakit/effects/effects.pri index 20eb692e6..2b003a072 100644 --- a/src/multimediakit/effects/effects.pri +++ b/src/multimediakit/effects/effects.pri @@ -1,7 +1,7 @@ INCLUDEPATH += effects unix:!mac { - contains(pulseaudio_enabled, yes) { + contains(config_test_pulseaudio, yes) { CONFIG += link_pkgconfig PKGCONFIG += libpulse diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index 32e5f3a31..513f810fb 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -17,7 +17,7 @@ DEPENDPATH += . HEADERS += dsserviceplugin.h SOURCES += dsserviceplugin.cpp -!contains(wmsdk_enabled, yes): DEFINES += QT_NO_WMSDK +!contains(config_test_wmsdk, yes): DEFINES += QT_NO_WMSDK include (player/player.pri) include (camera/camera.pri) diff --git a/src/plugins/gstreamer/gstreamer.pro b/src/plugins/gstreamer/gstreamer.pro index 9372ec2b6..1e3340b0f 100644 --- a/src/plugins/gstreamer/gstreamer.pro +++ b/src/plugins/gstreamer/gstreamer.pro @@ -24,7 +24,7 @@ PKGCONFIG += \ gstreamer-video-0.10 maemo*:PKGCONFIG +=gstreamer-plugins-bad-0.10 -contains(gstreamer-appsrc_enabled, yes): PKGCONFIG += gstreamer-app-0.10 +contains(config_test_gstreamer_appsrc, yes): PKGCONFIG += gstreamer-app-0.10 maemo6 { HEADERS += camerabuttonlistener_meego.h @@ -89,7 +89,7 @@ SOURCES += \ include(mediaplayer/mediaplayer.pri) include(mediacapture/mediacapture.pri) -contains(gstreamer-photography_enabled, yes) { +contains(config_test_gstreamer_photography, yes) { include(camerabin/camerabin.pri) } diff --git a/src/plugins/gstreamer/mediaplayer/mediaplayer.pri b/src/plugins/gstreamer/mediaplayer/mediaplayer.pri index 9045a80dd..310ed6f24 100644 --- a/src/plugins/gstreamer/mediaplayer/mediaplayer.pri +++ b/src/plugins/gstreamer/mediaplayer/mediaplayer.pri @@ -2,7 +2,7 @@ INCLUDEPATH += $$PWD DEFINES += QMEDIA_GSTREAMER_PLAYER -contains(gstreamer-appsrc_enabled, yes) { +contains(config_test_gstreamer_appsrc, yes) { HEADERS += $$PWD/qgstappsrc.h SOURCES += $$PWD/qgstappsrc.cpp diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 5de1159be..bf747612f 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -13,7 +13,7 @@ win32 { } win32 { - contains(directshow_enabled, yes): SUBDIRS += directshow + contains(config_test_directshow, yes): SUBDIRS += directshow } simulator: SUBDIRS += simulator @@ -34,7 +34,7 @@ unix:!mac { !maemo*:SUBDIRS += v4l - contains(pulseaudio_enabled, yes) { + contains(config_test_pulseaudio, yes) { SUBDIRS += pulseaudio } } diff --git a/sync.profile b/sync.profile index 68fbdc6a4..6370cb1cf 100644 --- a/sync.profile +++ b/sync.profile @@ -32,3 +32,16 @@ "qtxmlpatterns" => "refs/heads/master", "qtdeclarative" => "refs/heads/master", ); +# Compile tests +%configtests = ( + # Windows tests + "directshow" => {}, + "wmsdk" => {}, + "wmp" => {}, + "evr" => {}, + + # Linux tests + "gstreamer_photography" => {}, + "gstreamer_appsrc" => {}, + "pulseaudio" => {}, +); |