From e43222c3e8da9f42d0d95207fa94335165a27d9d Mon Sep 17 00:00:00 2001
From: Rusty Wagner <rusty.wagner@gmail.com>
Date: Fri, 19 Feb 2021 19:25:53 -0500
Subject: Compatibility with Qt 6

---
 ui/action.h            |  4 ++++
 ui/addressdialog.h     |  2 +-
 ui/featuremap.h        |  6 +++++-
 ui/menus.h             |  4 ++++
 ui/progressindicator.h |  4 ++++
 ui/reportwidget.h      | 10 ++++++++++
 ui/typeview.h          |  4 ++++
 ui/viewframe.h         |  6 +++++-
 8 files changed, 37 insertions(+), 3 deletions(-)

(limited to 'ui')

diff --git a/ui/action.h b/ui/action.h
index 45b09e1e..31d2e397 100644
--- a/ui/action.h
+++ b/ui/action.h
@@ -3,7 +3,11 @@
 #include <QtWidgets/QMenu>
 #include <QtWidgets/QMenuBar>
 #include <QtGui/QIcon>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QtWidgets/QShortcut>
+#else
+#include <QtGui/QShortcut>
+#endif
 #include <QtCore/QPointer>
 #include <functional>
 #include <map>
diff --git a/ui/addressdialog.h b/ui/addressdialog.h
index 0d8991b5..e3d02338 100644
--- a/ui/addressdialog.h
+++ b/ui/addressdialog.h
@@ -67,7 +67,7 @@ private Q_SLOTS:
 	void accepted();
 	void updateRelativeState(int state);
 	void updatePreview();
-	void updatePreview(QString data);
+	void updatePreviewWithText(QString data);
 
 public:
 	AddressDialogWithPreview(QWidget* parent, BinaryViewRef view, uint64_t here,
diff --git a/ui/featuremap.h b/ui/featuremap.h
index 939e46df..f8c38cdf 100644
--- a/ui/featuremap.h
+++ b/ui/featuremap.h
@@ -1,7 +1,11 @@
 #pragma once
 
-#include <QtWidgets/QAction>
 #include <QtGui/QColor>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#include <QtWidgets/QAction>
+#else
+#include <QtGui/QAction>
+#endif
 #include <QtGui/QImage>
 #include <QtWidgets/QMenu>
 #include <QtGui/QPainter>
diff --git a/ui/menus.h b/ui/menus.h
index 4ac751c3..4b0cc3a5 100644
--- a/ui/menus.h
+++ b/ui/menus.h
@@ -61,7 +61,11 @@ private Q_SLOTS:
 	void underMouseTimerEvent();
 
 protected:
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	void enterEvent(QEvent* event) override;
+#else
+	void enterEvent(QEnterEvent* event) override;
+#endif
 	void leaveEvent(QEvent* event) override;
 	void mouseReleaseEvent(QMouseEvent* event) override;
 };
diff --git a/ui/progressindicator.h b/ui/progressindicator.h
index 3d4d58ef..56976f31 100644
--- a/ui/progressindicator.h
+++ b/ui/progressindicator.h
@@ -104,7 +104,11 @@ Q_SIGNALS:
 	void clicked();
 
 protected:
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	void enterEvent(QEvent* event) override;
+#else
+	void enterEvent(QEnterEvent* event) override;
+#endif
 	void leaveEvent(QEvent* event) override;
     void mouseReleaseEvent(QMouseEvent* event) override { if (event->button() == Qt::LeftButton) Q_EMIT clicked(); }
     void timerEvent(QTimerEvent * event) override;
diff --git a/ui/reportwidget.h b/ui/reportwidget.h
index 02572490..25ee7a30 100644
--- a/ui/reportwidget.h
+++ b/ui/reportwidget.h
@@ -3,15 +3,20 @@
 #include <QtWidgets/QWidget>
 #include <QtWidgets/QTextBrowser>
 #include <QtWidgets/QScrollArea>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QtWebEngineWidgets/QWebEngineView>
 #include <QtWebEngineWidgets/QWebEngineScript>
 #include <QtWebEngineWidgets/QWebEngineScriptCollection>
 #include <QtWebEngineWidgets/QWebEnginePage>
 #include <QtWebEngineWidgets/QWebEngineSettings>
+#else
+#include <QtWidgets/QTextBrowser>
+#endif
 #include "binaryninjaapi.h"
 #include "action.h"
 #include "theme.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 class WebPage2 : public QWebEnginePage
 {
 	Q_OBJECT
@@ -25,12 +30,17 @@ protected:
 Q_SIGNALS:
 	void linkClicked(const QUrl&);
 };
+#endif
 
 class BINARYNINJAUIAPI ReportWidget: public QScrollArea, public UIActionHandler
 {
 	Q_OBJECT
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	QWebEngineView* m_contents;
+#else
+	QTextBrowser* m_contents;
+#endif
 	BinaryViewRef m_view;
 	std::string m_original;
 	std::string m_title;
diff --git a/ui/typeview.h b/ui/typeview.h
index 23985c59..40e41215 100644
--- a/ui/typeview.h
+++ b/ui/typeview.h
@@ -1,7 +1,11 @@
 #pragma once
 
 #include <QtWidgets/QAbstractScrollArea>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QtWidgets/QAction>
+#else
+#include <QtGui/QAction>
+#endif
 #include <QtCore/QTimer>
 #include <string>
 #include <utility>
diff --git a/ui/viewframe.h b/ui/viewframe.h
index 07832b65..0f86aa2b 100644
--- a/ui/viewframe.h
+++ b/ui/viewframe.h
@@ -1,7 +1,11 @@
 #pragma once
 
-#include <QtWidgets/QAction>
 #include <QtWidgets/QGestureEvent>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#include <QtWidgets/QAction>
+#else
+#include <QtGui/QAction>
+#endif
 #include <QtWidgets/QLabel>
 #include <QtCore/QPointer>
 #include <QtWidgets/QVBoxLayout>
-- 
cgit v1.3.1