diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-08 01:45:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-08 01:45:25 (GMT) |
| commit | 2acba36ac9943aed4ed7ea00453c185f76fdcf47 (patch) | |
| tree | 8b04ebe945a6963e4e7ad50c8806635ec6e7d376 /tests/auto/qtipc | |
| parent | f33b28d27a8e738fa93a45f44445d0fe255810b0 (diff) | |
| parent | 376343a9d14377ce8b9f92f9c3a35af267fce0ef (diff) | |
| download | Qt-2acba36ac9943aed4ed7ea00453c185f76fdcf47.zip Qt-2acba36ac9943aed4ed7ea00453c185f76fdcf47.tar.gz Qt-2acba36ac9943aed4ed7ea00453c185f76fdcf47.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
tests: make tests compile or disable those which don't compile
Diffstat (limited to 'tests/auto/qtipc')
| -rw-r--r-- | tests/auto/qtipc/qsharedmemory/qsharedmemory.pro | 4 | ||||
| -rw-r--r-- | tests/auto/qtipc/qtipc.pro | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tests/auto/qtipc/qsharedmemory/qsharedmemory.pro b/tests/auto/qtipc/qsharedmemory/qsharedmemory.pro index 9fef8e4..3193caa 100644 --- a/tests/auto/qtipc/qsharedmemory/qsharedmemory.pro +++ b/tests/auto/qtipc/qsharedmemory/qsharedmemory.pro @@ -1,4 +1,6 @@ TEMPLATE = subdirs SUBDIRS = test qsystemlock - +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + test \ + qsystemlock \ diff --git a/tests/auto/qtipc/qtipc.pro b/tests/auto/qtipc/qtipc.pro index 60037d2..fb32e51 100644 --- a/tests/auto/qtipc/qtipc.pro +++ b/tests/auto/qtipc/qtipc.pro @@ -4,3 +4,7 @@ SUBDIRS=\ qsharedmemory \ qsystemsemaphore \ +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + lackey \ + qsharedmemory \ + qsystemsemaphore \ |