diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-12-29 10:00:37 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-29 13:57:08 (GMT) |
| commit | 6974cc0a9ea2911a9ffd097f05955c1ca73e184a (patch) | |
| tree | b3c8f4ffca81112a4420ba26bab32b7b57aef70e /tests/auto/moc | |
| parent | 5991bc3b3b7c638592ec5e7060e467f4838201d8 (diff) | |
| download | Qt-6974cc0a9ea2911a9ffd097f05955c1ca73e184a.zip Qt-6974cc0a9ea2911a9ffd097f05955c1ca73e184a.tar.gz Qt-6974cc0a9ea2911a9ffd097f05955c1ca73e184a.tar.bz2 | |
tests: eliminated usage of qttest_p4.prf [part 3]
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: I65ba34a59db7aa15bc6304e690c825a4d6cd1037
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Diffstat (limited to 'tests/auto/moc')
| -rw-r--r-- | tests/auto/moc/moc.pro | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/moc/moc.pro b/tests/auto/moc/moc.pro index 4fb9ac4..f360a0b 100644 --- a/tests/auto/moc/moc.pro +++ b/tests/auto/moc/moc.pro @@ -1,4 +1,8 @@ -load(qttest_p4) +CONFIG += testcase + +TARGET = tst_moc +QT += sql network svg testlib +SOURCES += tst_moc.cpp #exists(/usr/include/boost/spirit.hpp) { # message("including boost headers in test") @@ -18,14 +22,10 @@ HEADERS += using-namespaces.h no-keywords.h task87883.h c-comments.h backslash-n dir-in-include-path.h single_function_keyword.h task192552.h task189996.h \ task234909.h task240368.h pure-virtual-signals.h if(*-g++*|*-icc*|*-clang|*-llvm):!irix-*:!win32-*: HEADERS += os9-newlines.h win-newlines.h -SOURCES += tst_moc.cpp -QT += sql network svg contains(QT_CONFIG, script): QT += script contains(QT_CONFIG, qt3support): QT += qt3support -contains(QT_CONFIG, dbus){ +contains(QT_CONFIG, dbus) { DEFINES += WITH_DBUS QT += dbus } - - |