diff options
Diffstat (limited to 'tests/auto/gui/text/qfont')
| -rw-r--r-- | tests/auto/gui/text/qfont/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/auto/gui/text/qfont/tst_qfont.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/gui/text/qfont/CMakeLists.txt b/tests/auto/gui/text/qfont/CMakeLists.txt index 32cbed7aaf..05c6ca8270 100644 --- a/tests/auto/gui/text/qfont/CMakeLists.txt +++ b/tests/auto/gui/text/qfont/CMakeLists.txt @@ -11,8 +11,7 @@ qt_internal_add_test(tst_qfont Qt::CorePrivate Qt::Gui Qt::GuiPrivate - INCLUDE_DIRECTORIES - ../../../../shared + Qt::TestPrivate ) # Resources: diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index efd1215d70..aa9f8a8ce4 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -41,7 +41,7 @@ #include <qwidget.h> #endif #include <qlist.h> -#include "emulationdetector.h" +#include <QtTest/private/qemulationdetector_p.h> class tst_QFont : public QObject { @@ -578,7 +578,7 @@ void tst_QFont::defaultFamily() } } #ifdef Q_PROCESSOR_ARM_32 - if (EmulationDetector::isRunningArmOnX86()) + if (QTestPrivate::isRunningArmOnX86()) QEXPECT_FAIL("", "Fails on ARMv7 QEMU (QTQAINFRA-4127)", Continue); #endif |