Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  tests: fixed compilation of tst_qtextstream
  QUiLoader, QAbstractFormBuilder: Introduce errorString().
  Enable configuration for Xcb
  Fall back to using paths for large fonts in drawStaticText()
  Add ability to work around non-standard GLES implementations
  Fix broken drawing with large fonts using QStaticText and FreeType
  Remove Q_ASSERT's from qdbustype autotest
  Remove autotest code for Qt3Support library.

1 files changed, 0 insertions, 7 deletions

diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp
index 7d628f50a0..1d0afccbd0 100644
--- a/tests/auto/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp
@@ -42,7 +42,6 @@
 
 #include <QtTest/QtTest>
 
-
 #include <qfile.h>
 #include <qdir.h>
 #include <qcoreapplication.h>
@@ -726,15 +725,9 @@ void tst_QFileInfo::dir()
     if (absPath) {
         QCOMPARE(fi.absolutePath(), expected);
         QCOMPARE(fi.absoluteDir().path(), expected);
-#ifdef QT3_SUPPORT
-        QCOMPARE(fi.dir(true).path(), expected);
-#endif
     } else {
         QCOMPARE(fi.path(), expected);
         QCOMPARE(fi.dir().path(), expected);
-#ifdef QT3_SUPPORT
-        QCOMPARE(fi.dir(false).path(), expected);
-#endif
     }
 }