From 07102cebded5b54acdb8d20f3e49be0aa0c2c1e2 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Tue, 25 Oct 2011 11:26:19 +1000 Subject: corelib: 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: I7c1ffe9c8c294dbdc988e1582e580b1ed3f4593e Reviewed-by: Jason McDonald --- tests/auto/corelib/io/qfile/largefile/largefile.pro | 5 +++-- tests/auto/corelib/io/qfile/test/test.pro | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'tests/auto/corelib/io/qfile') diff --git a/tests/auto/corelib/io/qfile/largefile/largefile.pro b/tests/auto/corelib/io/qfile/largefile/largefile.pro index 7786bdb892..5b5cf49f86 100644 --- a/tests/auto/corelib/io/qfile/largefile/largefile.pro +++ b/tests/auto/corelib/io/qfile/largefile/largefile.pro @@ -1,6 +1,7 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_largefile -QT = core +QT = core testlib SOURCES += tst_largefile.cpp wince*: SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp diff --git a/tests/auto/corelib/io/qfile/test/test.pro b/tests/auto/corelib/io/qfile/test/test.pro index 366432c57e..44dd20cf50 100644 --- a/tests/auto/corelib/io/qfile/test/test.pro +++ b/tests/auto/corelib/io/qfile/test/test.pro @@ -1,8 +1,8 @@ -load(qttest_p4) +CONFIG += testcase SOURCES += ../tst_qfile.cpp wince* { - QT = core gui + QT = core gui testlib files.files += ..\\dosfile.txt ..\\noendofline.txt ..\\testfile.txt \ ..\\testlog.txt ..\\two.dots.file ..\\tst_qfile.cpp \ ..\\Makefile ..\\forCopying.txt ..\\forRenaming.txt @@ -17,7 +17,7 @@ wince* { SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp # needed for QT_OPEN DEFINES += SRCDIR=\\\"\\\" } else { - QT = core network + QT = core network testlib DEFINES += SRCDIR=\\\"$$PWD/../\\\" } -- cgit v1.2.3