summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2011-11-24 13:25:21 +1000
committerQt by Nokia <qt-info@nokia.com>2011-11-24 05:06:44 +0100
commit9bb50446e34f556e067eabcc3e7e5ad72f28707c (patch)
tree6770e9dbe85e972101ef3766dfdc65a8063868fa /tests
parent0c7a747663edaf5c5cdfba7b2063570a3746b0c8 (diff)
QAudioDeviceInfo is actually an integration test.
It should be separated at some point. Change-Id: I03adde303eed558d52e06f0afa673252e54c2182 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/integration/multimedia.pro1
-rw-r--r--tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro (renamed from tests/auto/unit/qaudiodeviceinfo/qaudiodeviceinfo.pro)0
-rw-r--r--tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp (renamed from tests/auto/unit/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp)0
-rw-r--r--tests/auto/unit/multimedia.pro1
4 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/integration/multimedia.pro b/tests/auto/integration/multimedia.pro
index f09ce9410..99eb434a5 100644
--- a/tests/auto/integration/multimedia.pro
+++ b/tests/auto/integration/multimedia.pro
@@ -1,6 +1,7 @@
TEMPLATE = subdirs
SUBDIRS += \
+ qaudiodeviceinfo \
qaudioinput \
qaudiooutput \
qmediaplayerbackend \
diff --git a/tests/auto/unit/qaudiodeviceinfo/qaudiodeviceinfo.pro b/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro
index ffe9829bd..ffe9829bd 100644
--- a/tests/auto/unit/qaudiodeviceinfo/qaudiodeviceinfo.pro
+++ b/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro
diff --git a/tests/auto/unit/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp b/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
index f459a7449..f459a7449 100644
--- a/tests/auto/unit/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
+++ b/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
diff --git a/tests/auto/unit/multimedia.pro b/tests/auto/unit/multimedia.pro
index cee1f6465..aab830f86 100644
--- a/tests/auto/unit/multimedia.pro
+++ b/tests/auto/unit/multimedia.pro
@@ -4,7 +4,6 @@ SUBDIRS += \
qabstractvideobuffer \
qabstractvideosurface \
qaudiocapturesource \
- qaudiodeviceinfo \
qaudioformat \
qaudionamespace \
qcamera \