diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-01-25 17:56:33 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-01-25 17:56:33 (GMT) |
| commit | 5422e929cad04633a06c156cba96cfcd69262522 (patch) | |
| tree | afb3c9b76c05d80238a1ff76f4e8f4019fac1651 /tests/auto/qlayout | |
| parent | ac798c5d77c59ea8dfe29c9d1896fb6604e3a628 (diff) | |
| parent | a0e0a9378d10db9c8ab3ba4d59f5c576ee4cbc40 (diff) | |
| download | Qt-5422e929cad04633a06c156cba96cfcd69262522.zip Qt-5422e929cad04633a06c156cba96cfcd69262522.tar.gz Qt-5422e929cad04633a06c156cba96cfcd69262522.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
configure
src/network/bearer/bearer.pri
Diffstat (limited to 'tests/auto/qlayout')
| -rw-r--r-- | tests/auto/qlayout/qlayout.pro | 6 | ||||
| -rw-r--r-- | tests/auto/qlayout/tst_qlayout.cpp | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tests/auto/qlayout/qlayout.pro b/tests/auto/qlayout/qlayout.pro index dfa8584..bb1ae4a 100644 --- a/tests/auto/qlayout/qlayout.pro +++ b/tests/auto/qlayout/qlayout.pro @@ -10,5 +10,11 @@ wince*|symbian: { addFiles.files = baseline addFiles.path = . DEPLOYMENT += addFiles +} else { + DEFINES += SRCDIR=\\\"$$PWD\\\" + + test_data.files = baseline/* + test_data.path = $${target.path}/baseline + INSTALLS += test_data } diff --git a/tests/auto/qlayout/tst_qlayout.cpp b/tests/auto/qlayout/tst_qlayout.cpp index 65eae55..3090ebb 100644 --- a/tests/auto/qlayout/tst_qlayout.cpp +++ b/tests/auto/qlayout/tst_qlayout.cpp @@ -156,7 +156,8 @@ void tst_QLayout::smartMaxSize() { QVector<int> expectedWidths; - QFile f(QLatin1String("baseline/smartmaxsize")); + QFile f(QLatin1String(SRCDIR "/baseline/smartmaxsize")); + QCOMPARE(f.open(QIODevice::ReadOnly | QIODevice::Text), true); QTextStream stream(&f); |