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

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (166 commits)
  Fix the include header <qstring.h> -> <QtCore/qstring.h>
  bye bye QMakeProjectEnv
  short-cut evaluation inside if() tests
  eliminate special splitting of INCLUDEPATH and DEPENDPATH
  do not env-expand cache file path
  s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/
  s/INCPATH/INCLUDEPATH/
  s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/
  teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH)
  warn about usage of deprecated variables
  warn about using non-lowercased replace $$function()s
  add -Wdeprecated option (on by default)
  make QMakeProject::isEmpty() consider legacy mappings
  document some functions' scope
  fix $$size() not using function-scoped variables
  doc: Fixed some qdoc errors.
  qdoc: Added breadcrumbs for namespaces.
  Autotest: check that we receive key events on toplevel widgets
  Cocoa: key events stopped working
  Fix desktopservices demo missing icon in Symbian
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index 83b650a..0325948 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -1152,9 +1152,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;