Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Use SRCDIR as a base path for the test data.
  Add the test data to the INSTALLS target

2 files changed, 8 insertions, 1 deletions

diff --git a/tests/auto/qlayout/qlayout.pro b/tests/auto/qlayout/qlayout.pro
index c99f1d9..d3b76e3 100644
--- a/tests/auto/qlayout/qlayout.pro
+++ b/tests/auto/qlayout/qlayout.pro
@@ -10,5 +10,11 @@ wince*|symbian: {
    addFiles.sources = 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);