diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-04 14:17:44 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-04 14:17:44 (GMT) |
| commit | fc013b7be66a6d4fc13af8bd38b7e679ed3998af (patch) | |
| tree | cc068fa05bbc357bce89f8c6dfe37d6308704a1e /tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp | |
| parent | be41c140594ccea16ce17ccca7251d614cc75e1e (diff) | |
| parent | 4d53a691aaac9789ddd4f9d4e968d28ace2181ca (diff) | |
| download | Qt-fc013b7be66a6d4fc13af8bd38b7e679ed3998af.zip Qt-fc013b7be66a6d4fc13af8bd38b7e679ed3998af.tar.gz Qt-fc013b7be66a6d4fc13af8bd38b7e679ed3998af.tar.bz2 | |
Merge branch 'master' into lighthouse-master
Diffstat (limited to 'tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp')
| -rw-r--r-- | tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp index c234c96..6b63691 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 @@ -992,8 +997,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); |