summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2012-01-27 12:52:41 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-31 04:23:31 +0100
commit3f36f9b6500c9287644bb7c9afca88e0501b0b0f (patch)
tree4702dc7b3a0e07f288924c75429da7322107594f
parent341161c26eb5b08684e373110f7d3ff7c253295e (diff)
Changed qsplitter unittest to work from install directory
- Changed qsplitter unittest to use TESTDATA and QFINDTESTDATA Change-Id: I5db0fbfb20e6bd0ec169e884f16c1ec819f4e449 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
-rw-r--r--tests/auto/widgets/widgets/qsplitter/qsplitter.pro9
-rw-r--r--tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp2
2 files changed, 2 insertions, 9 deletions
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<IntList>("collapsibleStates");
QTest::addColumn<bool>("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;