diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-12-28 19:59:35 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-29 13:56:39 (GMT) |
| commit | 5991bc3b3b7c638592ec5e7060e467f4838201d8 (patch) | |
| tree | a1a77adcdf1075860c4e30d11d7f3a0eb5f24ff9 /tests/auto/qtipc | |
| parent | f80d04ea96a52090e939a53779aa04d4bd174f24 (diff) | |
| download | Qt-5991bc3b3b7c638592ec5e7060e467f4838201d8.zip Qt-5991bc3b3b7c638592ec5e7060e467f4838201d8.tar.gz Qt-5991bc3b3b7c638592ec5e7060e467f4838201d8.tar.bz2 | |
tests: eliminated usage of qttest_p4.prf [part 2]
qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4.
It enables various crufty undocumented magic, of dubious value.
Stop using it, and explicitly enable the things from it which we want.
Change-Id: I8a0bed9161ea9ac010ef3269f2e9baed7bbc2f41
Reviewed-by: Rohan McGovern
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Diffstat (limited to 'tests/auto/qtipc')
| -rw-r--r-- | tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro | 12 | ||||
| -rw-r--r-- | tests/auto/qtipc/qsharedmemory/test/test.pro | 12 | ||||
| -rw-r--r-- | tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro | 10 |
3 files changed, 16 insertions, 18 deletions
diff --git a/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro b/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro index e232443..88e4312 100644 --- a/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro +++ b/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro @@ -1,5 +1,8 @@ -CONFIG += qttest_p4 -#QT = core +CONFIG += testcase + +TARGET = tst_qsystemlock +QT += testlib +SOURCES += tst_qsystemlock.cpp include(../src/src.pri) win32: CONFIG += console @@ -15,8 +18,3 @@ DESTDIR = ./ DEFINES += QSHAREDMEMORY_DEBUG DEFINES += QSYSTEMSEMAPHORE_DEBUG - -SOURCES += tst_qsystemlock.cpp -TARGET = tst_qsystemlock - - diff --git a/tests/auto/qtipc/qsharedmemory/test/test.pro b/tests/auto/qtipc/qsharedmemory/test/test.pro index 50c2669..4dea9ce 100644 --- a/tests/auto/qtipc/qsharedmemory/test/test.pro +++ b/tests/auto/qtipc/qsharedmemory/test/test.pro @@ -1,18 +1,18 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = ../tst_qsharedmemory +QT = core testlib +SOURCES += ../tst_qsharedmemory.cpp include(../src/src.pri) -QT -= gui DEFINES += QSHAREDMEMORY_DEBUG DEFINES += QSYSTEMSEMAPHORE_DEBUG -SOURCES += ../tst_qsharedmemory.cpp -TARGET = ../tst_qsharedmemory - !wince*:win32 { CONFIG(debug, debug|release) { TARGET = ../../debug/tst_qsharedmemory -} else { + } else { TARGET = ../../release/tst_qsharedmemory } } diff --git a/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro b/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro index e05b6b8..f6bc369 100644 --- a/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro +++ b/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro @@ -1,5 +1,8 @@ -load(qttest_p4) -#QT = core +CONFIG += testcase + +TARGET = tst_qsystemsemaphore +QT += testlib +SOURCES += tst_qsystemsemaphore.cpp include(../qsharedmemory/src/src.pri) win32: CONFIG += console @@ -7,9 +10,6 @@ win32: CONFIG += console DEFINES += QSHAREDMEMORY_DEBUG DEFINES += QSYSTEMSEMAPHORE_DEBUG -SOURCES += tst_qsystemsemaphore.cpp -TARGET = tst_qsystemsemaphore - RESOURCES += files.qrc wince*: { |