diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-07 09:49:09 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-07 09:49:09 (GMT) |
commit | 376343a9d14377ce8b9f92f9c3a35af267fce0ef (patch) | |
tree | 01f0662984699bff715e2e7bf1a447b694409ec3 /tests/auto/qtipc/qsharedmemory/qsharedmemory.pro | |
parent | 8fb324791d89fa2e27566cc83aadecc13918b9bd (diff) | |
parent | 1290b1328c5168db0b922dfd19ba88db3cc265cf (diff) | |
download | Qt-376343a9d14377ce8b9f92f9c3a35af267fce0ef.zip Qt-376343a9d14377ce8b9f92f9c3a35af267fce0ef.tar.gz Qt-376343a9d14377ce8b9f92f9c3a35af267fce0ef.tar.bz2 |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
tests: make tests compile or disable those which don't compile
Fix declarative examples and demos issue on Windows
Symbian: allow apps to disable GL multisampling
QSqlRelationalTableModel doesn't follow relations on the first column
symbian - don't export qsymbianbearer.qtplugin twice
Diffstat (limited to 'tests/auto/qtipc/qsharedmemory/qsharedmemory.pro')
-rw-r--r-- | tests/auto/qtipc/qsharedmemory/qsharedmemory.pro | 4 |
1 files changed, 3 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 \ |