From 15684bf8d3ea11908b8e6acd754f838529ea7861 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Fri, 18 Jul 2025 16:58:27 +0200
Subject: [PATCH] Added Qt 5 Core Compat module for QRegExp for Qt 6

---
 plugins/FeedReader/FeedReader.pro               | 2 ++
 retroshare-gui/src/gui/chat/ChatWidget.cpp      | 1 +
 retroshare-gui/src/gui/common/RSTextBrowser.cpp | 1 +
 retroshare-gui/src/retroshare-gui.pro           | 2 ++
 retroshare-gui/src/util/HandleRichText.cpp      | 3 ++-
 retroshare-gui/src/util/HandleRichText.h        | 3 ++-
 6 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/FeedReader/FeedReader.pro b/plugins/FeedReader/FeedReader.pro
index 97137c2b2..4b0cae546 100644
--- a/plugins/FeedReader/FeedReader.pro
+++ b/plugins/FeedReader/FeedReader.pro
@@ -28,6 +28,8 @@ greaterThan(QT_MAJOR_VERSION, 4) {
 	QT += widgets
 }
 
+greaterThan(QT_MAJOR_VERSION,5): QT += core5compat
+
 target.files = lib/libFeedReader.so
 
 SOURCES =	FeedReaderPlugin.cpp \
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index 228c6d1cf..32e3991e1 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -61,6 +61,7 @@
 #include <QTimer>
 #include <QToolTip>
 #include <QInputDialog>
+#include <QRegExp>
 
 #include <time.h>
 
diff --git a/retroshare-gui/src/gui/common/RSTextBrowser.cpp b/retroshare-gui/src/gui/common/RSTextBrowser.cpp
index f0dfd8943..4a203ea1b 100644
--- a/retroshare-gui/src/gui/common/RSTextBrowser.cpp
+++ b/retroshare-gui/src/gui/common/RSTextBrowser.cpp
@@ -35,6 +35,7 @@
 #include <QPlainTextEdit>
 #include <QTextDocumentFragment>
 #include <QScrollBar>
+#include <QRegExp>
 
 #include <iostream>
 
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index 6a50480f5..9b0a31b6e 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -25,6 +25,8 @@ CONFIG += console
 TARGET = retroshare
 DEFINES += TARGET=\\\"$${TARGET}\\\"
 
+greaterThan(QT_MAJOR_VERSION,5): QT += core5compat
+
 DEPENDPATH  *= $${PWD} $${RS_INCLUDE_DIR}
 INCLUDEPATH *= $${PWD}
 
diff --git a/retroshare-gui/src/util/HandleRichText.cpp b/retroshare-gui/src/util/HandleRichText.cpp
index e74cc9071..5a4a166a4 100644
--- a/retroshare-gui/src/util/HandleRichText.cpp
+++ b/retroshare-gui/src/util/HandleRichText.cpp
@@ -27,6 +27,7 @@
 #include <qmath.h>
 #include <QUrl>
 #include <QRegularExpression>
+#include <QRegExp>
 
 #include "HandleRichText.h"
 #include "gui/RetroShareLink.h"
@@ -359,7 +360,7 @@ void RsHtml::filterEmbeddedImages(QDomDocument &doc, QDomElement &currentElement
 	}
 }
 
-int RsHtml::indexInWithValidation(QRegExp &rx, const QString &text, EmbedInHtml &embedInfos, int pos)
+int RsHtml::indexInWithValidation(const QRegExp &rx, const QString &text, EmbedInHtml &embedInfos, int pos)
 {
 	int index = rx.indexIn(text, pos);
 	if(index == -1 || embedInfos.myType != Img) return index;
diff --git a/retroshare-gui/src/util/HandleRichText.h b/retroshare-gui/src/util/HandleRichText.h
index 3e98ea21c..cefb40c70 100644
--- a/retroshare-gui/src/util/HandleRichText.h
+++ b/retroshare-gui/src/util/HandleRichText.h
@@ -54,6 +54,7 @@ class QDomElement;
 class EmbedInHtml;
 class RetroShareLink;
 class QTextCursor;
+class QRegExp;
 
 class RsHtml
 {
@@ -89,7 +90,7 @@ protected:
 	virtual void   anchorStylesheetForImg(QDomDocument &doc, QDomElement &element, const RetroShareLink &link, QString &styleSheet);
 
 private:
-	int indexInWithValidation(QRegExp &rx, const QString &text, EmbedInHtml &embedInfos, int pos = 0);
+	int indexInWithValidation(const QRegExp &rx, const QString &text, EmbedInHtml &embedInfos, int pos = 0);
 };
 
 #endif // HANDLE_RICH_TEXT_H_