From 3f36f9b6500c9287644bb7c9afca88e0501b0b0f Mon Sep 17 00:00:00 2001 From: Kurt Korbatits Date: Fri, 27 Jan 2012 12:52:41 +1000 Subject: Changed qsplitter unittest to work from install directory - Changed qsplitter unittest to use TESTDATA and QFINDTESTDATA Change-Id: I5db0fbfb20e6bd0ec169e884f16c1ec819f4e449 Reviewed-by: Kurt Korbatits Reviewed-by: Jason McDonald Reviewed-by: Rohan McGovern --- tests/auto/widgets/widgets/qsplitter/qsplitter.pro | 9 +-------- tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'tests/auto/widgets/widgets') diff --git a/tests/auto/widgets/widgets/qsplitter/qsplitter.pro b/tests/auto/widgets/widgets/qsplitter/qsplitter.pro index 79015269ef..8ae745ea9d 100644 --- a/tests/auto/widgets/widgets/qsplitter/qsplitter.pro +++ b/tests/auto/widgets/widgets/qsplitter/qsplitter.pro @@ -3,11 +3,4 @@ TARGET = tst_qsplitter QT += widgets testlib SOURCES += tst_qsplitter.cpp -wince* { - addFiles.files = extradata.txt setSizes3.dat - addFiles.path = . - DEPLOYMENT += addFiles - DEFINES += SRCDIR=\\\"./\\\" -} else { - DEFINES += SRCDIR=\\\"$$PWD/\\\" -} +TESTDATA += extradata.txt setSizes3.dat diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp index 32cf2e470f..048f1441a2 100644 --- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp +++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp @@ -198,7 +198,7 @@ void tst_QSplitter::setSizes_data() QTest::addColumn("collapsibleStates"); QTest::addColumn("childrenCollapse"); - QFile file(SRCDIR "setSizes3.dat"); + QFile file(QFINDTESTDATA("setSizes3.dat")); if (!file.open(QIODevice::ReadOnly)) { qDebug() << "Can't open file, reason:" << file.errorString(); return; -- cgit v1.2.3