From 4bee29609659e7cf556c80bdf2389ec3c68735a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Sat, 23 Oct 2021 17:11:50 +0200
Subject: [PATCH] Strict qt5.15 breaks poppler

---
 YACReader/viewer.cpp |  4 ++++
 config.pri           | 11 ++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/YACReader/viewer.cpp b/YACReader/viewer.cpp
index 6b595a70..23ad54db 100644
--- a/YACReader/viewer.cpp
+++ b/YACReader/viewer.cpp
@@ -775,7 +775,11 @@ void Viewer::mouseMoveEvent(QMouseEvent *event)
 
 const QPixmap Viewer::pixmap()
 {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     return content->pixmap();
+#else
+    return content->pixmap(Qt::ReturnByValue);
+#endif
 }
 
 void Viewer::magnifyingGlassSwitch()
diff --git a/config.pri b/config.pri
index 0b00b076..6259bd13 100644
--- a/config.pri
+++ b/config.pri
@@ -36,9 +36,6 @@ defineTest(minQtVersion) {
   error(YACReader requires Qt 5.15 or newer but $$[QT_VERSION] was detected)
 }
 
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050F00
-DEFINES += QT_DEPRECATED_WARNINGS
-
 # reduce log pollution
 CONFIG += silent
 
@@ -81,3 +78,11 @@ unix:!macx:!CONFIG(poppler):!CONFIG(pdfium):!CONFIG(no_pdf) {
 macx:!CONFIG(pdfkit):!CONFIG(pdfium):!CONFIG(no_pdf) {
   CONFIG += pdfkit
 }
+
+!CONFIG(poppler) {
+    DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050F00
+} else {
+    DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050900
+}
+
+DEFINES += QT_DEPRECATED_WARNINGS