diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 12:38:33 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 12:38:33 +1000 |
| commit | 02d7512525e3db01d66235a5874e024995b8579c (patch) | |
| tree | b103ad0d26d3cd5141540b7ca050af8f0b712dae | |
| parent | 958a8233fdcb5a541692f8750d451bce54e2090e (diff) | |
| parent | b7f082f4184344a7a218e0c0f20aa036bbca1479 (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging:
tests: build autotests by default for qtphonon
| -rw-r--r-- | qtphonon.pro | 6 | ||||
| -rw-r--r-- | tests/tests.pro | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/qtphonon.pro b/qtphonon.pro index 0da9087..bdc0f98 100644 --- a/qtphonon.pro +++ b/qtphonon.pro @@ -2,3 +2,9 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS += src \ # examples \ + +tests.subdir = tests +tests.CONFIG = no_default_install +!contains(QT_BUILD_PARTS,tests):tests.CONFIG += no_default_target + +SUBDIRS += tests diff --git a/tests/tests.pro b/tests/tests.pro new file mode 100644 index 0000000..c75a32a --- /dev/null +++ b/tests/tests.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = auto |