6 files changed, 27 insertions, 9 deletions
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index 295678d3c..c636e0659 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -13,7 +13,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 5.6.0
+VERSION = 5.6.2
 
 SOURCES += \
     ScintillaEdit.cpp \
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index 38aec01a0..96e7f2865 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -1378,8 +1378,13 @@ void Platform::Assert(const char *c, const char *file, int line) noexcept
 	char buffer[2000];
 	snprintf(buffer, std::size(buffer), "Assertion [%s] failed at %s %d", c, file, line);
 	if (Platform::ShowAssertionPopUps(false)) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
+		QMessageBox mb(QMessageBox::Icon::NoIcon, "Assertion Failure", buffer,
+				QMessageBox::StandardButton::Ok);
+#else
 		QMessageBox mb("Assertion Failure", buffer, QMessageBox::NoIcon,
 			QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton);
+#endif
 		mb.exec();
 	} else {
 		strcat(buffer, "\n");
diff --git a/qt/ScintillaEditBase/PlatQt.h b/qt/ScintillaEditBase/PlatQt.h
index 08cda9dc4..a4d924014 100644
--- a/qt/ScintillaEditBase/PlatQt.h
+++ b/qt/ScintillaEditBase/PlatQt.h
@@ -61,13 +61,14 @@ inline Point PointFromQPoint(QPoint qp)
 	return Point(qp.x(), qp.y());
 }
 
-inline QPointF QPointFFromPoint(Point qp)
+inline Point PointFromQPointF(QPointF qp)
 {
-	return QPointF(qp.x, qp.y);
+	return Point(qp.x(), qp.y());
 }
 
-constexpr PRectangle RectangleInset(PRectangle rc, XYPOSITION delta) noexcept {
-	return PRectangle(rc.left + delta, rc.top + delta, rc.right - delta, rc.bottom - delta);
+inline QPointF QPointFFromPoint(Point qp)
+{
+	return QPointF(qp.x, qp.y);
 }
 
 class SurfaceImpl : public Surface {
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp
index 187da9dbe..477dd44cf 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -304,6 +304,16 @@ unsigned int TimeOfEvent(const QElapsedTimer &timer)
 	return static_cast<unsigned int>(timer.elapsed() % maxTime);
 }
 
+Point PointOfEvent(const QDropEvent *event)
+{
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+	PLATFORM_ASSERT(false);
+	return PointFromQPointF(event->position());
+#else
+	return PointFromQPoint(event->pos());
+#endif
+}
+
 }
 
 void ScintillaEditBase::mousePressEvent(QMouseEvent *event)
@@ -396,7 +406,7 @@ void ScintillaEditBase::dragEnterEvent(QDragEnterEvent *event)
 	} else if (event->mimeData()->hasText()) {
 		event->acceptProposedAction();
 
-		const Point point = PointFromQPoint(event->pos());
+		const Point point = PointOfEvent(event);
 		sqt->DragEnter(point);
 	} else {
 		event->ignore();
@@ -415,7 +425,7 @@ void ScintillaEditBase::dragMoveEvent(QDragMoveEvent *event)
 	} else if (event->mimeData()->hasText()) {
 		event->acceptProposedAction();
 
-		const Point point = PointFromQPoint(event->pos());
+		const Point point = PointOfEvent(event);
 		sqt->DragMove(point);
 	} else {
 		event->ignore();
@@ -430,7 +440,7 @@ void ScintillaEditBase::dropEvent(QDropEvent *event)
 	} else if (event->mimeData()->hasText()) {
 		event->acceptProposedAction();
 
-		const Point point = PointFromQPoint(event->pos());
+		const Point point = PointOfEvent(event);
 		const bool move = (event->source() == this &&
                  event->proposedAction() == Qt::MoveAction);
 		sqt->Drop(point, event->mimeData(), move);
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index d2ab750df..6e95cca86 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -13,7 +13,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 5.6.0
+VERSION = 5.6.2
 
 SOURCES += \
     PlatQt.cpp \
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp
index d5e6eb7b0..5e9d262a4 100644
--- a/qt/ScintillaEditBase/ScintillaQt.cpp
+++ b/qt/ScintillaEditBase/ScintillaQt.cpp
@@ -768,6 +768,8 @@ sptr_t ScintillaQt::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam)
 		}
 	} catch (std::bad_alloc &) {
 		errorStatus = Status::BadAlloc;
+	} catch (Failure &failure) {
+		errorStatus = failure.status;
 	} catch (...) {
 		errorStatus = Status::Failure;
 	}