From e939dc31a2372c13bd3e79c46aeb082e91220608 Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Date: Wed, 17 Jan 2024 15:57:58 +0100
Subject: [PATCH] Revert "Skip tst_examples on ASAN builds with Freetype font
 engine"

It is no longer needed, since the bug in the Freetype cache is
presumably fixed.

Task-number: QTBUG-118867
Change-Id: I7b22ddc5c238c4161a97f7c9a8c8e785d4849581
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit ee4b23418d9535df482571edaedee927034c38b0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/quick/examples/tst_examples.cpp | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp
index 0dafcc73b2..b46353c16d 100644
--- a/tests/auto/quick/examples/tst_examples.cpp
+++ b/tests/auto/quick/examples/tst_examples.cpp
@@ -11,9 +11,6 @@
 #include <QQmlEngine>
 #include <QQmlError>
 
-#include <QtGui/private/qfont_p.h>
-#include <QtGui/private/qfontengine_p.h>
-
 static QtMessageHandler testlibMsgHandler = nullptr;
 void msgHandlerFilter(QtMsgType type, const QMessageLogContext &ctxt, const QString &msg)
 {
@@ -227,15 +224,6 @@ void tst_examples::examples_data()
 void tst_examples::examples()
 {
     QFETCH(QString, file);
-
-#if defined(__SANITIZE_ADDRESS__) || __has_feature(address_sanitizer)
-    QFont f;
-    f.setStyleStrategy(QFont::NoFontMerging);
-    QFontPrivate *font_d = QFontPrivate::get(f);
-    if (font_d->engineForScript(QChar::Script_Common)->type() == QFontEngine::Freetype)
-        QSKIP("Triggers a race condition in the Freetype face cache, QTBUG-118867", Continue);
-#endif
-
     QQuickWindow window;
     window.setPersistentGraphics(true);
     window.setPersistentSceneGraph(true);