summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2012-06-19 11:22:46 +0300
committerQt by Nokia <qt-info@nokia.com>2012-08-09 13:18:08 +0200
commit5410299d945354cfe96729b6779fbfcbe2f4ae28 (patch)
treeb77151d7a4f11037f3988dcb72dff1a00841735d
parent2ccd34fd20b72a1cd4125d67dd206d4f968a1b5d (diff)
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 <miikka.heikkinen@digia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
-rw-r--r--tests/auto/widgets/kernel/qlayout/qlayout.pro2
-rw-r--r--tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp2
2 files changed, 1 insertions, 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<int> expectedWidths;
- QFile f(QLatin1String(SRCDIR "/baseline/smartmaxsize"));
+ QFile f(QFINDTESTDATA("baseline/smartmaxsize"));
QCOMPARE(f.open(QIODevice::ReadOnly | QIODevice::Text), true);