diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-07-19 15:51:43 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-25 03:13:03 +0200 |
| commit | 1b1012f2990084ffc367ddb4aaf5910835bc4641 (patch) | |
| tree | 95826215bceaada774084c4e2a41211a40e95bde /config.tests | |
| parent | 518ae46dfeb0bc87ea787bfe6bf0a5e183db8442 (diff) | |
Add the configuration tests.
Add the list of tests to sync.profile, and make sure each test only happens
on the platforms it's intended for.
Change-Id: Id022a6b85b349f4a8a649d3449b622e4ada7f4f4
Reviewed-on: http://codereview.qt.nokia.com/1910
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/directshow/directshow.pro | 2 | ||||
| -rw-r--r-- | config.tests/evr/evr.pro | 2 | ||||
| -rw-r--r-- | config.tests/gstreamer_appsrc/gstreamer_appsrc.pro (renamed from config.tests/gstreamer-appsrc/gstreamer-appsrc.pro) | 3 | ||||
| -rw-r--r-- | config.tests/gstreamer_appsrc/main.cpp (renamed from config.tests/gstreamer-appsrc/main.cpp) | 0 | ||||
| -rw-r--r-- | config.tests/gstreamer_photography/gstreamer_photography.pro (renamed from config.tests/gstreamer-photography/gstreamer-photography.pro) | 3 | ||||
| -rw-r--r-- | config.tests/gstreamer_photography/main.cpp (renamed from config.tests/gstreamer-photography/main.cpp) | 0 | ||||
| -rw-r--r-- | config.tests/pulseaudio/pulseaudio.pro | 5 | ||||
| -rw-r--r-- | config.tests/wmp/wmp.pro | 2 | ||||
| -rw-r--r-- | config.tests/wmsdk/wmsdk.pro | 2 |
9 files changed, 16 insertions, 3 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 |