diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-12-04 01:59:31 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-12-07 09:45:03 (GMT) |
| commit | 1290b1328c5168db0b922dfd19ba88db3cc265cf (patch) | |
| tree | 01f0662984699bff715e2e7bf1a447b694409ec3 /tests/auto/qtipc | |
| parent | 8a390046adddb8df3ddcf3a421f6f547e6cfe7aa (diff) | |
| download | Qt-1290b1328c5168db0b922dfd19ba88db3cc265cf.zip Qt-1290b1328c5168db0b922dfd19ba88db3cc265cf.tar.gz Qt-1290b1328c5168db0b922dfd19ba88db3cc265cf.tar.bz2 | |
tests: make tests compile or disable those which don't compile
These changes are mostly a backport from qtbase and a fix to
those tests that are dependent on private APIs.
Change-Id: I6e647583d7aaddf525d719c3b61f59a0c9aedf74
Reviewed-by: Rohan McGovern
Reviewed-by: Friedemann Kleint
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 \ |