Date: Sat, 4 Apr 2020 12:27:32 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530652 - head/graphics/fractgen/files Message-ID: <202004041227.034CRWtW034034@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sat Apr 4 12:27:31 2020 New Revision: 530652 URL: https://svnweb.freebsd.org/changeset/ports/530652 Log: graphics/fractgen: Prepare for Qt5-5.14 PR: 244964 Added: head/graphics/fractgen/files/patch-src_imagedisplay.cc (contents, props changed) head/graphics/fractgen/files/patch-src_imagedisplay.h (contents, props changed) Added: head/graphics/fractgen/files/patch-src_imagedisplay.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/fractgen/files/patch-src_imagedisplay.cc Sat Apr 4 12:27:31 2020 (r530652) @@ -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); Added: head/graphics/fractgen/files/patch-src_imagedisplay.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/fractgen/files/patch-src_imagedisplay.h Sat Apr 4 12:27:31 2020 (r530652) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004041227.034CRWtW034034>