Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I35cfe1a52ec4a02dccc0895e3b4a40bd2ffe7295

2 files changed, 7 insertions, 2 deletions

diff --git a/tests/libfuzzer/svg/qsvgrenderer/render/main.cpp b/tests/libfuzzer/svg/qsvgrenderer/render/main.cpp
index 0197115..2439e52 100644
--- a/tests/libfuzzer/svg/qsvgrenderer/render/main.cpp
+++ b/tests/libfuzzer/svg/qsvgrenderer/render/main.cpp
@@ -36,7 +36,7 @@ extern "C" int LLVMFuzzerTestOneInput(const char *Data, size_t Size) {
     static QApplication a(c, nullptr);
     static QImage image(377, 233, QImage::Format_RGB32);
     static QPainter painter(&image);
-    QSvgRenderer renderer(QByteArray(Data, Size));
+    QSvgRenderer renderer(QByteArray::fromRawData(Data, Size));
     renderer.render(&painter);
     return 0;
 }
diff --git a/tests/libfuzzer/svg/qsvgrenderer/render/render.pro b/tests/libfuzzer/svg/qsvgrenderer/render/render.pro
index be94755..4059899 100644
--- a/tests/libfuzzer/svg/qsvgrenderer/render/render.pro
+++ b/tests/libfuzzer/svg/qsvgrenderer/render/render.pro
@@ -1,3 +1,8 @@
 QT += svg
 SOURCES += main.cpp
-LIBS += -fsanitize=fuzzer
+FUZZ_ENGINE = $$(LIB_FUZZING_ENGINE)
+isEmpty(FUZZ_ENGINE) {
+    QMAKE_LFLAGS += -fsanitize=fuzzer
+} else {
+    LIBS += $$FUZZ_ENGINE
+}