--- a/libgui/qterminal/libqterminal/QTerminal.cc	Wed Apr 12 11:08:13 2023 -0400
+++ b/libgui/qterminal/libqterminal/QTerminal.cc	Wed Apr 12 17:57:48 2023 +0200
@@ -25,15 +25,16 @@
 #  include "config.h"
 #endif
 
+#include <QAction>
+#include <QApplication>
+#include <QClipboard>
+#include <QColor>
 #include <QKeySequence>
-#include <QWidget>
-#include <QStringList>
-#include <QColor>
 #include <QList>
 #include <QMenu>
-#include <QClipboard>
-#include <QApplication>
-#include <QAction>
+#include <QRegularExpression>
+#include <QStringList>
+#include <QWidget>
 
 #include "gui-preferences-global.h"
 #include "gui-preferences-cs.h"
@@ -85,14 +86,13 @@
     // detecting links and error messages yet
     if (has_selected_text)
       {
-        QRegExp file ("(?:[ \\t]+)(\\S+) at line (\\d+) column (?:\\d+)");
-
-        int pos = file.indexIn (selected_text);
+        QRegularExpression file {"(?:[ \\t]+)(\\S+) at line (\\d+) column (?:\\d+)"};
+        QRegularExpressionMatch match = file.match (selected_text);
 
-        if (pos > -1)
+        if (match.hasMatch ())
           {
-            QString file_name = file.cap (1);
-            QString line = file.cap (2);
+            QString file_name = match.captured (1);
+            QString line = match.captured (2);
 
             _edit_action->setVisible (true);
             _edit_action->setText (tr ("Edit %1 at line %2")
@@ -107,13 +107,12 @@
 
     if (has_selected_text)
       {
-        QRegExp expr (".*\b*(\\w+)\b*.*");
-
-        int pos = expr.indexIn (selected_text);
+        QRegularExpression expr {".*\b*(\\w+)\b*.*"};
+        QRegularExpressionMatch match = expr.match (selected_text);
 
-        if (pos > -1)
+        if (match.hasMatch ())
           {
-            QString expr_found = expr.cap (1);
+            QString expr_found = match.captured (1);
 
             m_edit_selected_action->setVisible (true);
             m_edit_selected_action->setText (tr ("Edit %1").arg (expr_found));
@@ -153,7 +152,7 @@
 void
 QTerminal::run_selection ()
 {
-  QStringList commands = selectedText ().split (QRegExp ("[\r\n]"),
+  QStringList commands = selectedText ().split (QRegularExpression {"[\r\n]"},
 #if defined (HAVE_QT_SPLITBEHAVIOR_ENUM)
                                                 Qt::SkipEmptyParts);
 #else

--- a/src/octave-svgconvert.cc	Wed Apr 12 11:08:13 2023 -0400
+++ b/src/octave-svgconvert.cc	Wed Apr 12 17:57:48 2023 +0200
@@ -44,7 +44,7 @@
 #include <QImage>
 #include <QPainter>
 #include <QPrinter>
-#include <QRegExp>
+#include <QRegularExpression>
 
 // Include a set of path rendering functions extracted from Qt-5.12 source
 #include "octave-qsvghandler.h"
@@ -138,12 +138,9 @@
 // Extract field arguments in a style-like string, e.g. "bla field(1,34,56) bla"
 QString get_field (QString str, QString field)
 {
-  QString retval;
-  QRegExp rx (field + "\\(([^\\)]*)\\)");
-  int pos = 0;
-  pos = rx.indexIn (str, pos);
-  if (pos > -1)
-    retval = rx.cap (1);
+  QRegularExpression rx (field + "\\(([^\\)]*)\\)");
+  QRegularExpressionMatch match = rx.match (str);
+  QString retval = match.captured ();
 
   return retval;
 }