graphics/fractgen: Prepare for Qt5-5.14

PR:		244964

2 files changed, 51 insertions, 0 deletions

diff --git a/graphics/fractgen/files/patch-src_imagedisplay.cc b/graphics/fractgen/files/patch-src_imagedisplay.cc
new file mode 100644
index 000000000000..17e226930a76
--- /dev/null
+++ b/graphics/fractgen/files/patch-src_imagedisplay.cc
@@ -0,0 +1,30 @@
+Fix build with Qt5-5.14
+
+--- src/imagedisplay.cc.orig	2020-04-04 12:10:32 UTC
++++ src/imagedisplay.cc
+@@ -134,7 +134,7 @@ void ImageDisplay::mousePressEvent(QMouseEvent* mouseE
+       MarkX2           = MarkX1;
+       MarkY2           = MarkY1;
+       Marking          = true;
+-      LastOffsetUpdate = QTime::currentTime();
++      LastOffsetUpdate.start();
+       update();
+    }
+ }
+@@ -143,7 +143,6 @@ void ImageDisplay::mousePressEvent(QMouseEvent* mouseE
+ // ###### Handle mouse release for marking ##################################
+ void ImageDisplay::mouseReleaseEvent(QMouseEvent* mouseEvent)
+ {
+-   LastOffsetUpdate = QTime();
+    mouseMoveEvent(mouseEvent);
+ 
+    if((mouseEvent->button() & Qt::LeftButton) && (Marking)) {
+@@ -185,7 +184,7 @@ void ImageDisplay::mouseMoveEvent(QMouseEvent* mouseEv
+ 
+       if((movex != 0) || (movey != 0)) {
+          offsetUpdate((int)OffsetX + movex, (int)OffsetY + movey);
+-         LastOffsetUpdate = QTime::currentTime();
++         LastOffsetUpdate.start();
+       }
+ 
+       getMarkPosition(mouseEvent, MarkX2, MarkY2);
diff --git a/graphics/fractgen/files/patch-src_imagedisplay.h b/graphics/fractgen/files/patch-src_imagedisplay.h
new file mode 100644
index 000000000000..d083a9307d87
--- /dev/null
+++ b/graphics/fractgen/files/patch-src_imagedisplay.h
@@ -0,0 +1,21 @@
+Fix build with Qt5-5.14
+
+--- src/imagedisplay.h.orig	2020-04-04 12:04:22 UTC
++++ src/imagedisplay.h
+@@ -23,6 +23,7 @@
+ #ifndef IMAGEDISPLAY_H
+ #define IMAGEDISPLAY_H
+ 
++#include <QElapsedTimer>
+ #include <QtWidgets/QWidget>
+ #include <QImage>
+ #include <QPainter>
+@@ -85,7 +86,7 @@ class ImageDisplay : public QWidget {
+    QImage*      Image;
+    unsigned int OffsetX;
+    unsigned int OffsetY;
+-   QTime        LastOffsetUpdate;
++   QElapsedTimer LastOffsetUpdate;
+    int          MarkX1;
+    int          MarkY1;
+    int          MarkX2;