From 6b3ed00300a56ef42a1267a8a8cf3a4453b4bfbd Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Mon, 10 Oct 2011 14:37:41 +1000 Subject: tests: eliminated usage of qttest_p4.prf 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: If1b29a37fd7bdc8aadb598761279bd156cdf343b Reviewed-on: http://codereview.qt-project.org/6284 Sanity-Review: Qt Sanity Bot Reviewed-by: Jason McDonald --- tests/auto/headersclean/headersclean.pro | 5 +++-- tests/auto/mediaobject/mediaobject.pro | 5 +++-- tests/auto/mediaobject_wince_ds9/mediaobject_wince_ds9.pro | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro index ca192bc..0adac1d 100644 --- a/tests/auto/headersclean/headersclean.pro +++ b/tests/auto/headersclean/headersclean.pro @@ -1,5 +1,6 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_headersclean SOURCES += tst_headersclean.cpp -QT = core +QT = core testlib contains(QT_CONFIG,phonon): QT += phonon diff --git a/tests/auto/mediaobject/mediaobject.pro b/tests/auto/mediaobject/mediaobject.pro index 3377d9c..365f7e6 100755 --- a/tests/auto/mediaobject/mediaobject.pro +++ b/tests/auto/mediaobject/mediaobject.pro @@ -2,8 +2,9 @@ # Project file for autotest for file mediaobject.h ############################################################ -load(qttest_p4) - +CONFIG += testcase +TARGET = tst_mediaobject +QT += testlib contains(QT_CONFIG, phonon):QT += phonon SOURCES += tst_mediaobject.cpp HEADERS += qtesthelper.h diff --git a/tests/auto/mediaobject_wince_ds9/mediaobject_wince_ds9.pro b/tests/auto/mediaobject_wince_ds9/mediaobject_wince_ds9.pro index ec3cd59..24d4634 100644 --- a/tests/auto/mediaobject_wince_ds9/mediaobject_wince_ds9.pro +++ b/tests/auto/mediaobject_wince_ds9/mediaobject_wince_ds9.pro @@ -2,8 +2,9 @@ # Project file for autotest for file mediaobject.h ############################################################ -load(qttest_p4) - +CONFIG += testcase +TARGET = tst_mediaobject_wince_ds9 +QT += testlib contains(QT_CONFIG, phonon):QT += phonon wince*{ -- cgit v1.2.3