diff options
Diffstat (limited to 'tests/auto/gui/itemmodels/qfilesystemmodel')
-rw-r--r-- | tests/auto/gui/itemmodels/qfilesystemmodel/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/auto/gui/itemmodels/qfilesystemmodel/tst_qfilesystemmodel.cpp | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/auto/gui/itemmodels/qfilesystemmodel/CMakeLists.txt b/tests/auto/gui/itemmodels/qfilesystemmodel/CMakeLists.txt index 375eb5b245..31fd8ca32d 100644 --- a/tests/auto/gui/itemmodels/qfilesystemmodel/CMakeLists.txt +++ b/tests/auto/gui/itemmodels/qfilesystemmodel/CMakeLists.txt @@ -6,15 +6,13 @@ qt_internal_add_test(tst_qfilesystemmodel SOURCES - ../../../../shared/emulationdetector.h tst_qfilesystemmodel.cpp - INCLUDE_DIRECTORIES - ../../../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui Qt::Widgets Qt::WidgetsPrivate + Qt::TestPrivate ) ## Scopes: diff --git a/tests/auto/gui/itemmodels/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/gui/itemmodels/qfilesystemmodel/tst_qfilesystemmodel.cpp index a096fcd324..b9c44aa4c2 100644 --- a/tests/auto/gui/itemmodels/qfilesystemmodel/tst_qfilesystemmodel.cpp +++ b/tests/auto/gui/itemmodels/qfilesystemmodel/tst_qfilesystemmodel.cpp @@ -27,11 +27,11 @@ ****************************************************************************/ -#include <emulationdetector.h> #include <QTest> #include <QSignalSpy> #include <QTemporaryFile> #include <QLoggingCategory> +#include <QtTest/private/qemulationdetector_p.h> #ifdef QT_BUILD_INTERNAL #include <private/qfilesystemmodel_p.h> @@ -792,7 +792,7 @@ void tst_QFileSystemModel::sort() QTreeView tree; tree.setWindowTitle(QTest::currentTestFunction()); - if (fileDialogMode && EmulationDetector::isRunningArmOnX86()) + if (fileDialogMode && QTestPrivate::isRunningArmOnX86()) QSKIP("Crashes in QEMU. QTBUG-70572"); #ifdef QT_BUILD_INTERNAL |