6 files changed, 30 insertions, 6 deletions
diff --git a/tests/libfuzzer/gui/iccparser/iccparser.pro b/tests/libfuzzer/gui/iccparser/iccparser.pro
deleted file mode 100644
index bf4037eae7..0000000000
--- a/tests/libfuzzer/gui/iccparser/iccparser.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-QT += gui
-SOURCES += main.cpp
-LIBS += -fsanitize=fuzzer
diff --git a/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/fromiccprofile.pro b/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/fromiccprofile.pro
new file mode 100644
index 0000000000..934ff81077
--- /dev/null
+++ b/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/fromiccprofile.pro
@@ -0,0 +1,8 @@
+QT += gui
+SOURCES += main.cpp
+FUZZ_ENGINE = $$(LIB_FUZZING_ENGINE)
+isEmpty(FUZZ_ENGINE) {
+    QMAKE_LFLAGS += -fsanitize=fuzzer
+} else {
+    LIBS += $$FUZZ_ENGINE
+}
diff --git a/tests/libfuzzer/gui/iccparser/main.cpp b/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/main.cpp
index 1db43d2e25..7681c1468e 100644
--- a/tests/libfuzzer/gui/iccparser/main.cpp
+++ b/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/main.cpp
@@ -29,6 +29,10 @@
 #include <QGuiApplication>
 #include <QColorSpace>
 
+// Run this with
+// QT_LOGGING_RULES="qt.gui.icc=false"
+// to reduce noise and increase speed.
+
 extern "C" int LLVMFuzzerTestOneInput(const char *data, size_t size) {
     static int c = 0;
     static QGuiApplication a(c, nullptr);
diff --git a/tests/libfuzzer/gui/text/qtextdocument/setHtml/setHtml.pro b/tests/libfuzzer/gui/text/qtextdocument/setHtml/setHtml.pro
index c9b14f6caf..af5ef9e940 100644
--- a/tests/libfuzzer/gui/text/qtextdocument/setHtml/setHtml.pro
+++ b/tests/libfuzzer/gui/text/qtextdocument/setHtml/setHtml.pro
@@ -1,3 +1,8 @@
 QT += widgets
 SOURCES += main.cpp
-LIBS += -fsanitize=fuzzer
+FUZZ_ENGINE = $$(LIB_FUZZING_ENGINE)
+isEmpty(FUZZ_ENGINE) {
+    QMAKE_LFLAGS += -fsanitize=fuzzer
+} else {
+    LIBS += $$FUZZ_ENGINE
+}
diff --git a/tests/libfuzzer/gui/text/qtextdocument/setMarkdown/setMarkdown.pro b/tests/libfuzzer/gui/text/qtextdocument/setMarkdown/setMarkdown.pro
index 4a2dfa51b9..758622e1af 100644
--- a/tests/libfuzzer/gui/text/qtextdocument/setMarkdown/setMarkdown.pro
+++ b/tests/libfuzzer/gui/text/qtextdocument/setMarkdown/setMarkdown.pro
@@ -1,4 +1,9 @@
 CONFIG += console
 CONFIG -= app_bundle
 SOURCES += main.cpp
-LIBS += -fsanitize=fuzzer
+FUZZ_ENGINE = $$(LIB_FUZZING_ENGINE)
+isEmpty(FUZZ_ENGINE) {
+    QMAKE_LFLAGS += -fsanitize=fuzzer
+} else {
+    LIBS += $$FUZZ_ENGINE
+}
diff --git a/tests/libfuzzer/gui/text/qtextlayout/beginLayout/beginLayout.pro b/tests/libfuzzer/gui/text/qtextlayout/beginLayout/beginLayout.pro
index c9b14f6caf..af5ef9e940 100644
--- a/tests/libfuzzer/gui/text/qtextlayout/beginLayout/beginLayout.pro
+++ b/tests/libfuzzer/gui/text/qtextlayout/beginLayout/beginLayout.pro
@@ -1,3 +1,8 @@
 QT += widgets
 SOURCES += main.cpp
-LIBS += -fsanitize=fuzzer
+FUZZ_ENGINE = $$(LIB_FUZZING_ENGINE)
+isEmpty(FUZZ_ENGINE) {
+    QMAKE_LFLAGS += -fsanitize=fuzzer
+} else {
+    LIBS += $$FUZZ_ENGINE
+}