1 files changed, 12 insertions, 3 deletions
diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
index 12007cc..53781c9 100644
--- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -41,7 +41,10 @@
 
 
 #include <QtTest/QtTest>
+#ifdef QT_BUILD_INTERNAL
 #include "../../../src/gui/dialogs/qfilesystemmodel_p.h"
+#endif
+#include <QFileSystemModel>
 #include <QFileIconProvider>
 #include <QTreeView>
 #include <QHeaderView>
@@ -826,8 +829,10 @@ void tst_QFileSystemModel::sort()
     MyFriendFileSystemModel *myModel = new MyFriendFileSystemModel();
     QTreeView *tree = new QTreeView();
 
+#ifdef QT_BUILD_INTERNAL
     if (fileDialogMode)
         myModel->d_func()->disableRecursiveSort = true;
+#endif
 
     QDir dir(QDir::tempPath());
     //initialize the randomness
@@ -975,8 +980,12 @@ void tst_QFileSystemModel::drives()
     model.setRootPath(path);
     model.fetchMore(QModelIndex());
     QFileInfoList drives = QDir::drives();
+    int driveCount = 0;
+    foreach(const QFileInfo& driveRoot, drives)
+        if (driveRoot.exists())
+            driveCount++;
     QTest::qWait(5000);
-    QTRY_COMPARE(model.rowCount(), drives.count());
+    QTRY_COMPARE(model.rowCount(), driveCount);
 }
 
 void tst_QFileSystemModel::dirsBeforeFiles()
@@ -992,8 +1001,8 @@ void tst_QFileSystemModel::dirsBeforeFiles()
         }
         dir.rmdir(dirPath);
     }
-    dir.mkpath(dirPath);
-    QVERIFY(dir.exists());
+    QVERIFY(dir.mkpath(dirPath));
+    QVERIFY(QDir(dirPath).exists());
 
     for (int i = 0; i < 3; ++i) {
         QLatin1Char c('a' + i);