From 5410299d945354cfe96729b6779fbfcbe2f4ae28 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 19 Jun 2012 11:22:46 +0300 Subject: [PATCH] Fix qlayout autotest build for WinCE. SRCDIR was not defined for WinCE but it should no longer be used. Fixed test case to use QFINDTESTDATA instead. Change-Id: I07cbf7d42790d33e2d205d1682ec10e7577a92bd Reviewed-by: Miikka Heikkinen Reviewed-by: Andreas Holzammer --- tests/auto/widgets/kernel/qlayout/qlayout.pro | 2 -- tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/auto/widgets/kernel/qlayout/qlayout.pro b/tests/auto/widgets/kernel/qlayout/qlayout.pro index 4f4457b1a0..c7751aa698 100644 --- a/tests/auto/widgets/kernel/qlayout/qlayout.pro +++ b/tests/auto/widgets/kernel/qlayout/qlayout.pro @@ -9,8 +9,6 @@ wince* { addFiles.path = . DEPLOYMENT += addFiles } else { - DEFINES += SRCDIR=\\\"$$PWD\\\" - TESTDATA += baseline/* } DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp index 647376412f..4ada7531ca 100644 --- a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp +++ b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp @@ -152,7 +152,7 @@ void tst_QLayout::smartMaxSize() { QVector expectedWidths; - QFile f(QLatin1String(SRCDIR "/baseline/smartmaxsize")); + QFile f(QFINDTESTDATA("baseline/smartmaxsize")); QCOMPARE(f.open(QIODevice::ReadOnly | QIODevice::Text), true);