Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix desktopservices demo missing icon in Symbian
  Fix path removal from target in Symbian builds
  Fix compilation errors in tst_qfileinfo
  Symbian (installation) docs.
  Make 'make sis' recursive again.
  Fix libinfix usage
  Make symbian-resource files aware of libInfix configure feature
  Update symbian def files for 4.7
  Correction to EGL stub implementation
  Fix 'make sis' when media services is disabled and multimedia is not

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index 403c5f9..4c651bf 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -1120,9 +1120,9 @@ void tst_QFileInfo::isHidden_data()
         t << "foobar";
 
         QFile file2(notHiddenFileName);
-        QVERIFY(file2.open(QIODevice::WriteOnly))
-        QTextStream t(&file);
-        t << "foobar";
+        QVERIFY(file2.open(QIODevice::WriteOnly));
+        QTextStream t2(&file2);
+        t2 << "foobar";
     }
 
     RFs rfs;