diff options
Diffstat (limited to 'tests/auto')
11 files changed, 18 insertions, 8 deletions
diff --git a/tests/auto/gui/itemmodels/CMakeLists.txt b/tests/auto/gui/itemmodels/CMakeLists.txt index b8c55489c4..e1d3ad3f6b 100644 --- a/tests/auto/gui/itemmodels/CMakeLists.txt +++ b/tests/auto/gui/itemmodels/CMakeLists.txt @@ -1,6 +1,9 @@ # Generated from itemmodels.pro. add_subdirectory(qstandarditem) +if(NOT MINGW) + add_subdirectory(qfilesystemmodel) +endif() if(TARGET Qt::Widgets) add_subdirectory(qstandarditemmodel) endif() diff --git a/tests/auto/gui/itemmodels/itemmodels.pro b/tests/auto/gui/itemmodels/itemmodels.pro index 8a300d0210..cde70aa2b2 100644 --- a/tests/auto/gui/itemmodels/itemmodels.pro +++ b/tests/auto/gui/itemmodels/itemmodels.pro @@ -1,7 +1,10 @@ TEMPLATE=subdirs SUBDIRS= \ qstandarditem \ - qstandarditemmodel + qstandarditemmodel \ + qfilesystemmodel + +mingw: SUBDIRS -= qfilesystemmodel # QTBUG-29403 !qtHaveModule(widgets): SUBDIRS -= \ qstandarditemmodel diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/.gitignore b/tests/auto/gui/itemmodels/qfilesystemmodel/.gitignore index 9804e5a3d7..9804e5a3d7 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/.gitignore +++ b/tests/auto/gui/itemmodels/qfilesystemmodel/.gitignore diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST b/tests/auto/gui/itemmodels/qfilesystemmodel/BLACKLIST index 4119afce84..4119afce84 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST +++ b/tests/auto/gui/itemmodels/qfilesystemmodel/BLACKLIST diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt b/tests/auto/gui/itemmodels/qfilesystemmodel/CMakeLists.txt index 595b30bd56..595b30bd56 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt +++ b/tests/auto/gui/itemmodels/qfilesystemmodel/CMakeLists.txt diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/qfilesystemmodel.pro b/tests/auto/gui/itemmodels/qfilesystemmodel/qfilesystemmodel.pro index db8cf7de3f..db8cf7de3f 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/qfilesystemmodel.pro +++ b/tests/auto/gui/itemmodels/qfilesystemmodel/qfilesystemmodel.pro diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/gui/itemmodels/qfilesystemmodel/tst_qfilesystemmodel.cpp index e814e79dbe..e814e79dbe 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp +++ b/tests/auto/gui/itemmodels/qfilesystemmodel/tst_qfilesystemmodel.cpp diff --git a/tests/auto/widgets/dialogs/CMakeLists.txt b/tests/auto/widgets/dialogs/CMakeLists.txt index 0c52076efe..13c4e6cad8 100644 --- a/tests/auto/widgets/dialogs/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/CMakeLists.txt @@ -10,9 +10,6 @@ add_subdirectory(qinputdialog) add_subdirectory(qmessagebox) add_subdirectory(qprogressdialog) add_subdirectory(qwizard) -if(NOT MINGW) - add_subdirectory(qfilesystemmodel) -endif() if(QT_FEATURE_private_tests) add_subdirectory(qsidebar) endif() diff --git a/tests/auto/widgets/dialogs/dialogs.pro b/tests/auto/widgets/dialogs/dialogs.pro index cf548f2dea..b4217a219d 100644 --- a/tests/auto/widgets/dialogs/dialogs.pro +++ b/tests/auto/widgets/dialogs/dialogs.pro @@ -5,7 +5,6 @@ SUBDIRS=\ qerrormessage \ qfiledialog \ qfiledialog2 \ - qfilesystemmodel \ qfontdialog \ qinputdialog \ qmessagebox \ @@ -17,4 +16,4 @@ SUBDIRS=\ qsidebar \ mac:qinputdialog.CONFIG += no_check_target # QTBUG-25496 -mingw: SUBDIRS -= qfilesystemmodel # QTBUG-29403 + diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp index e6130c56b1..cbb1c72b11 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp @@ -49,7 +49,7 @@ #include <qmenu.h> #include <qrandom.h> #include "../../../../../src/widgets/dialogs/qsidebar_p.h" -#include "../../../../../src/widgets/dialogs/qfilesystemmodel_p.h" +#include "../../../../../src/gui/itemmodels/qfilesystemmodel_p.h" #include "../../../../../src/widgets/dialogs/qfiledialog_p.h" #include <private/qguiapplication_p.h> diff --git a/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp index 146a9e262d..20866a0fa7 100644 --- a/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp +++ b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp @@ -29,7 +29,8 @@ #include <QtTest/QtTest> #include <QtWidgets/private/qsidebar_p.h> -#include <QtWidgets/private/qfilesystemmodel_p.h> +#include <QtGui/private/qfilesystemmodel_p.h> +#include <QtWidgets/qfileiconprovider.h> class tst_QSidebar : public QObject { Q_OBJECT @@ -40,12 +41,16 @@ private slots: void addUrls(); void goToUrl(); + +private: + QFileIconProvider defaultIconProvider; }; void tst_QSidebar::setUrls() { QList<QUrl> urls; QFileSystemModel fsmodel; + fsmodel.setIconProvider(&defaultIconProvider); QSidebar qsidebar; qsidebar.setModelAndUrls(&fsmodel, urls); QAbstractItemModel *model = qsidebar.model(); @@ -67,6 +72,7 @@ void tst_QSidebar::selectUrls() urls << QUrl::fromLocalFile(QDir::rootPath()) << QUrl::fromLocalFile(QDir::temp().absolutePath()); QFileSystemModel fsmodel; + fsmodel.setIconProvider(&defaultIconProvider); QSidebar qsidebar; qsidebar.setModelAndUrls(&fsmodel, urls); @@ -79,6 +85,7 @@ void tst_QSidebar::addUrls() { QList<QUrl> emptyUrls; QFileSystemModel fsmodel; + fsmodel.setIconProvider(&defaultIconProvider); QSidebar qsidebar; qsidebar.setModelAndUrls(&fsmodel, emptyUrls); QAbstractItemModel *model = qsidebar.model(); @@ -179,6 +186,7 @@ void tst_QSidebar::goToUrl() urls << QUrl::fromLocalFile(QDir::rootPath()) << QUrl::fromLocalFile(QDir::temp().absolutePath()); QFileSystemModel fsmodel; + fsmodel.setIconProvider(&defaultIconProvider); QSidebar qsidebar; qsidebar.setModelAndUrls(&fsmodel, urls); qsidebar.show(); |